#include "wx/toolbar.h"
#include "minifram.h"
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if !defined(__WXMSW__) && !defined(__WXPM__)
#include "mondrian.xpm"
+#endif
#include "bitmaps/new.xpm"
#include "bitmaps/open.xpm"
#include "bitmaps/save.xpm"
#include "bitmaps/print.xpm"
#include "bitmaps/preview.xpm"
#include "bitmaps/help.xpm"
-#endif
-// start wxWindows
+
+// start wxWidgets
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;
// The `main program' equivalent, creating the windows and returning the
bool MyApp::OnInit()
{
// Create the main frame window
- main_frame = new MyMainFrame((wxFrame *) NULL, -1, "wxFrame sample",
+ main_frame = new MyMainFrame((wxFrame *) NULL, wxID_ANY, _T("wxFrame sample"),
wxPoint(100, 100), wxSize(300, 200));
main_frame->CreateToolBar(wxNO_BORDER|wxTB_VERTICAL, ID_TOOLBAR);
InitToolbar(main_frame->GetToolBar());
- button = new wxButton( main_frame, ID_REPARENT, "Press to reparent!" );
+ button = new wxButton( main_frame, ID_REPARENT, _T("Press to reparent!") );
// Create the mini frame window
- mini_frame = new MyMiniFrame( main_frame, -1, "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());
-#ifdef __WXMSW__
- main_frame->SetIcon(wxIcon("mondrian"));
- mini_frame->SetIcon(wxIcon("mondrian"));
-#else
- main_frame->SetIcon( wxIcon(mondrian_xpm) );
- mini_frame->SetIcon( wxIcon(mondrian_xpm) );
-#endif
+ main_frame->SetIcon(wxICON(mondrian));
+ mini_frame->SetIcon(wxICON(mondrian));
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)
// Set up toolbar
wxBitmap* toolBarBitmaps[8];
-#ifdef __WXMSW__
- toolBarBitmaps[0] = new wxBitmap("icon1");
- toolBarBitmaps[1] = new wxBitmap("icon2");
- toolBarBitmaps[2] = new wxBitmap("icon3");
- toolBarBitmaps[3] = new wxBitmap("icon4");
- toolBarBitmaps[4] = new wxBitmap("icon5");
- toolBarBitmaps[5] = new wxBitmap("icon6");
- toolBarBitmaps[6] = new wxBitmap("icon7");
- toolBarBitmaps[7] = new wxBitmap("icon8");
-#else
toolBarBitmaps[0] = new wxBitmap( new_xpm );
toolBarBitmaps[1] = new wxBitmap( open_xpm );
toolBarBitmaps[2] = new wxBitmap( save_xpm );
toolBarBitmaps[5] = new wxBitmap( preview_xpm );
toolBarBitmaps[6] = new wxBitmap( print_xpm );
toolBarBitmaps[7] = new wxBitmap( help_xpm );
-#endif
-#ifdef __WXMSW__
- int width = 24;
-#else
int width = 16;
-#endif
int currentX = 5;
- toolBar->AddTool(wxID_NEW, *(toolBarBitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "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, "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, "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, "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, "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, "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, "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, "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
void MyMiniFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
{
// make it known that the miniframe is no more
- mini_frame_exists = FALSE;
+ mini_frame_exists = false;
Destroy();
}
void MyMiniFrame::OnReparent(wxCommandEvent& WXUNUSED(event))
{
button->Reparent( main_frame );
+
+ // we need to force the frame to size its (new) child correctly
+ main_frame->SendSizeEvent();
}
// MyMainFrame
// practical jokers might find satisfaction in reparenting the button
// after closing the mini_frame. We'll have the last laugh.
if (! mini_frame_exists)
- wxMessageBox("The miniframe no longer exists.\n"
- "You don't want to make this button an orphan, do you?",
- "You got to be kidding");
+ wxMessageBox(_T("The miniframe no longer exists.\n")
+ _T("You don't want to make this button an orphan, do you?"),
+ _T("You got to be kidding"));
else
+ {
button->Reparent( mini_frame );
-}
-
+ // same as above
+ mini_frame->SendSizeEvent();
+ }
+}
projects / wxWidgets.git / blobdiff