X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/600683ca0561c9d56e73f1faa3f21d8a6670936b..b70362998b8f562923f6ed6708f06537ac056cd4:/samples/minifram/minifram.cpp?ds=sidebyside diff --git a/samples/minifram/minifram.cpp b/samples/minifram/minifram.cpp index e99b132d58..4b01ac159f 100644 --- a/samples/minifram/minifram.cpp +++ b/samples/minifram/minifram.cpp @@ -23,7 +23,7 @@ #include "wx/toolbar.h" #include "minifram.h" -#if !defined(__WXMSW__) +#if !defined(__WXMSW__) && !defined(__WXPM__) #include "mondrian.xpm" #endif #include "bitmaps/new.xpm" @@ -37,7 +37,7 @@ #include "bitmaps/help.xpm" -// start wxWindows +// start wxWidgets IMPLEMENT_APP(MyApp) @@ -45,26 +45,56 @@ IMPLEMENT_APP(MyApp) MyMainFrame *main_frame = (MyMainFrame*) NULL; MyMiniFrame *mini_frame = (MyMiniFrame*) NULL; -bool mini_frame_exists = FALSE; +bool mini_frame_exists = false; wxButton *button = (wxButton*) NULL; +#define ID_SET_SIZE_TO_150_150 100 +#define ID_SET_SIZE_TO_200_200 101 +#define ID_SET_MAX_SIZE_TO_150_150 102 +#define ID_SET_MAX_SIZE_TO_300_300 103 + // The `main program' equivalent, creating the windows and returning the // main frame bool MyApp::OnInit() { + if ( !wxApp::OnInit() ) + return false; + // Create the main frame window - main_frame = new MyMainFrame((wxFrame *) NULL, -1, _T("wxFrame sample"), + main_frame = new MyMainFrame((wxFrame *) NULL, wxID_ANY, _T("wxFrame sample"), wxPoint(100, 100), wxSize(300, 200)); + main_frame->SetSizeHints( 100,100, 400,400 ); + + wxMenu *file_menu = new wxMenu; + file_menu->Append(wxID_EXIT, _T("E&xit\tAlt-Q")); + file_menu->Append(ID_SET_SIZE_TO_150_150, _T("Set frame size to 150,150\tF2")); + file_menu->Append(ID_SET_SIZE_TO_200_200, _T("Set frame size to 200,200\tF3")); + file_menu->Append(ID_SET_MAX_SIZE_TO_150_150, _T("Set frame max size to 150,150\tF4")); + file_menu->Append(ID_SET_MAX_SIZE_TO_300_300, _T("Set frame max size to 300,300\tF5")); + + wxMenuBar *menu_bar = new wxMenuBar; + menu_bar->Append(file_menu, _T("&File")); + main_frame->SetMenuBar(menu_bar); + + main_frame->Connect( ID_SET_SIZE_TO_150_150, wxID_ANY, + wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyMainFrame::OnSetSize_150_150) ); + main_frame->Connect( ID_SET_SIZE_TO_200_200, wxID_ANY, + wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyMainFrame::OnSetSize_200_200) ); + main_frame->Connect( ID_SET_MAX_SIZE_TO_150_150, wxID_ANY, + wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyMainFrame::OnSetMaxSize_150_150) ); + main_frame->Connect( ID_SET_MAX_SIZE_TO_300_300, wxID_ANY, + wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyMainFrame::OnSetMaxSize_300_300) ); + main_frame->CreateToolBar(wxNO_BORDER|wxTB_VERTICAL, ID_TOOLBAR); InitToolbar(main_frame->GetToolBar()); button = new wxButton( main_frame, ID_REPARENT, _T("Press to reparent!") ); // Create the mini frame window - mini_frame = new MyMiniFrame( main_frame, -1, _T("wxMiniFrame sample"), + mini_frame = new MyMiniFrame( main_frame, wxID_ANY, _T("wxMiniFrame sample"), wxPoint(100, 100), wxSize(220, 100)); - mini_frame_exists = TRUE; + mini_frame_exists = true; mini_frame->CreateToolBar(wxNO_BORDER|wxTB_HORIZONTAL|wxTB_FLAT, ID_TOOLBAR); InitToolbar(mini_frame->GetToolBar()); @@ -74,10 +104,10 @@ bool MyApp::OnInit() SetTopWindow(main_frame); - main_frame->Show(TRUE); - mini_frame->Show(TRUE); + main_frame->Show(true); + mini_frame->Show(true); - return TRUE; + return true; } bool MyApp::InitToolbar(wxToolBar* toolBar) @@ -100,35 +130,35 @@ bool MyApp::InitToolbar(wxToolBar* toolBar) int width = 16; int currentX = 5; - toolBar->AddTool(wxID_NEW, *(toolBarBitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("New file")); + toolBar->AddTool(wxID_NEW, *(toolBarBitmaps[0]), wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("New file")); currentX += width + 5; - toolBar->AddTool(wxID_OPEN, *(toolBarBitmaps[1]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Open file")); + toolBar->AddTool(wxID_OPEN, *(toolBarBitmaps[1]), wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Open file")); currentX += width + 5; - toolBar->AddTool(wxID_SAVE, *(toolBarBitmaps[2]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Save file")); + toolBar->AddTool(wxID_SAVE, *(toolBarBitmaps[2]), wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Save file")); currentX += width + 5; toolBar->AddSeparator(); - toolBar->AddTool(wxID_COPY, *(toolBarBitmaps[3]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Copy")); + toolBar->AddTool(wxID_COPY, *(toolBarBitmaps[3]), wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Copy")); currentX += width + 5; - toolBar->AddTool(wxID_CUT, *(toolBarBitmaps[4]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Cut")); + toolBar->AddTool(wxID_CUT, *(toolBarBitmaps[4]), wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Cut")); currentX += width + 5; - toolBar->AddTool(wxID_PASTE, *(toolBarBitmaps[5]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Paste")); + toolBar->AddTool(wxID_PASTE, *(toolBarBitmaps[5]), wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Paste")); currentX += width + 5; toolBar->AddSeparator(); - toolBar->AddTool(wxID_PRINT, *(toolBarBitmaps[6]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Reparent the button")); + toolBar->AddTool(wxID_PRINT, *(toolBarBitmaps[6]), wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Reparent the button")); currentX += width + 5; toolBar->AddSeparator(); - toolBar->AddTool(wxID_HELP, *(toolBarBitmaps[7]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Help")); + toolBar->AddTool(wxID_HELP, *(toolBarBitmaps[7]), wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Help")); toolBar->Realize(); - toolBar->EnableTool( wxID_HELP, FALSE ); + toolBar->EnableTool( wxID_HELP, false ); // Can delete the bitmaps since they're reference counted int i; for (i = 0; i < 8; i++) delete toolBarBitmaps[i]; - return TRUE; + return true; } // MyMiniFrame @@ -148,7 +178,7 @@ MyMiniFrame::MyMiniFrame(wxFrame* parent, wxWindowID id, const wxString& title, void MyMiniFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) { // make it known that the miniframe is no more - mini_frame_exists = FALSE; + mini_frame_exists = false; Destroy(); } @@ -196,4 +226,22 @@ void MyMainFrame::OnReparent(wxCommandEvent& WXUNUSED(event)) } } +void MyMainFrame::OnSetSize_150_150(wxCommandEvent& WXUNUSED(event)) +{ + SetSize( 150, 150 ); +} +void MyMainFrame::OnSetSize_200_200(wxCommandEvent& WXUNUSED(event)) +{ + SetSize( 200, 200 ); +} + +void MyMainFrame::OnSetMaxSize_150_150(wxCommandEvent& WXUNUSED(event)) +{ + SetSizeHints( -1, -1, 150, 150 ); +} + +void MyMainFrame::OnSetMaxSize_300_300(wxCommandEvent& WXUNUSED(event)) +{ + SetSizeHints( -1, -1, 300, 300 ); +}