Show
Ignore:
Timestamp:
08/20/10 15:06:58 (21 months ago)
Author:
Carsten
Message:

Merged latest changes from trunk into branches/cafu_to_wx.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • cafu/branches/cafu_to_wx/CaWE/ToolEditSurface.hpp

    r36 r124  
    3939 
    4040    // Implementations/overrides of ToolT methods. 
    41     int       GetWxEventID() { return ChildFrameT::ID_MENU_TOOLS_TOOL_EDITSURFACEPROPERTIES; } 
     41    int       GetWxEventID() const { return ChildFrameT::ID_MENU_TOOLS_TOOL_EDITSURFACEPROPERTIES; } 
    4242    wxWindow* GetOptionsBar(); 
    4343    void      OnActivate(ToolT* OldTool);