Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-11-30 10:07:03 +00:00
parent 9fc3ad34c5
commit 6b8b0e7ca0
10 changed files with 202 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/dialoged/src/dialoged.h
View File

@@ -33,7 +33,7 @@ class MyApp: public wxApp
void OnObjectPopupMenu(wxCommandEvent& event)
{
return ObjectMenuProc((wxMenu *)event.GetEventObject(), event);
ObjectMenuProc((wxMenu *)event.GetEventObject(), event);
}
private:

5
utils/ogl/samples/ogledit/palette.cpp
View File

@@ -105,11 +105,6 @@ EditorToolPalette *MyApp::CreatePalette(wxFrame *parent)
palette->SetMargins(2, 2);
#ifdef __WXMSW__
if (palette->IsKindOf(CLASSINFO(wxToolBar95)))
((wxToolBar95 *)palette)->SetToolBitmapSize(wxSize(22, 22));
#endif
palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, TRUE, 0, -1, NULL, "Pointer");
palette->AddTool(PALETTE_TOOL1, PaletteTool1, wxNullBitmap, TRUE, 0, -1, NULL, "Tool 1");
palette->AddTool(PALETTE_TOOL2, PaletteTool2, wxNullBitmap, TRUE, 0, -1, NULL, "Tool 2");

9
utils/ogl/samples/studio/shapes.cpp
View File

@@ -1183,3 +1183,12 @@ void studioShapeEditProc(wxMenu& menu, wxCommandEvent& event)
}
}
BEGIN_EVENT_TABLE(ShapeEditMenu, wxMenu)
EVT_COMMAND_RANGE(1, 65000, wxEVT_COMMAND_MENU_SELECTED, ShapeEditMenu::OnCommand)
END_EVENT_TABLE()
void ShapeEditMenu::OnCommand(wxCommandEvent& event)
{
studioShapeEditProc(*this, event);
}

10
utils/ogl/samples/studio/shapes.h
View File

@@ -252,6 +252,16 @@ public:
wxString m_label;
};
class ShapeEditMenu: public wxMenu
{
public:
ShapeEditMenu() {}
void OnCommand(wxCommandEvent& event);
DECLARE_EVENT_TABLE()
};
extern void studioShapeEditProc(wxMenu& menu, wxCommandEvent& event);
#endif

2
utils/ogl/samples/studio/studio.cpp
View File

@@ -167,7 +167,7 @@ bool csApp::OnInit(void)
FillProjectTreeCtrl();
// Create the shape editing menu
m_shapeEditMenu = new wxMenu("", (wxFunction)studioShapeEditProc);
m_shapeEditMenu = new ShapeEditMenu;
m_shapeEditMenu->Append(ID_CS_EDIT_PROPERTIES, "Edit properties");
m_shapeEditMenu->AppendSeparator();
m_shapeEditMenu->Append(ID_CS_ROTATE_CLOCKWISE, "Rotate clockwise");