added wxUSE_INTL around wxLocale::GetSystemEncoding

[wxWidgets.git] / samples / mdi / mdi.cpp

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index ebcd2cc97711269695cad1b6f9c5aaaa876da12e..6e84cdb231e7ebfdd15dc0f6684ced229a0ff0f0 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -31,7 +31,7 @@
 
 #include <wx/toolbar.h>
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     #include "mondrian.xpm"
     #include "bitmaps/new.xpm"
     #include "bitmaps/open.xpm"
@@ -80,6 +80,12 @@ END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame)
     EVT_MENU(MDI_CHILD_QUIT, MyChild::OnQuit)
     EVT_MENU(MDI_REFRESH, MyChild::OnRefresh)
+    EVT_MENU(MDI_CHANGE_TITLE, MyChild::OnChangeTitle)
+    EVT_MENU(MDI_CHANGE_POSITION, MyChild::OnChangePosition)
+    EVT_MENU(MDI_CHANGE_SIZE, MyChild::OnChangeSize)
+
+    EVT_SIZE(MyChild::OnSize)
+    EVT_MOVE(MyChild::OnMove)
 
     EVT_CLOSE(MyChild::OnClose)
 END_EVENT_TABLE()
@@ -104,6 +110,14 @@ bool MyApp::OnInit()
     frame = new MyFrame((wxFrame *)NULL, -1, "MDI Demo",
                         wxPoint(-1, -1), wxSize(500, 400),
                         wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL);
+#ifdef __WXMSW__
+#if 0
+    // Experimental: change the window menu
+    wxMenu* windowMenu = new wxMenu;
+    windowMenu->Append(5000, "My menu item!");
+    frame->SetWindowMenu(windowMenu);
+#endif
+#endif
 
     // Give it an icon
 #ifdef __WXMSW__
@@ -115,11 +129,11 @@ bool MyApp::OnInit()
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 
-    file_menu->Append(MDI_NEW_WINDOW, "&New window", "Create a new child window");
-    file_menu->Append(MDI_QUIT, "&Exit", "Quit the program");
+    file_menu->Append(MDI_NEW_WINDOW, "&New window\tCtrl-N", "Create a new child window");
+    file_menu->Append(MDI_QUIT, "&Exit\tAlt-X", "Quit the program");
 
     wxMenu *help_menu = new wxMenu;
-    help_menu->Append(MDI_ABOUT, "&About");
+    help_menu->Append(MDI_ABOUT, "&About\tF1");
 
     wxMenuBar *menu_bar = new wxMenuBar;
 
@@ -172,7 +186,7 @@ void MyFrame::OnClose(wxCloseEvent& event)
     if ( event.CanVeto() && (gs_nFrames > 0) )
     {
         wxString msg;
-        msg.Printf("%d windows still open, close anyhow?", gs_nFrames);
+        msg.Printf(_T("%d windows still open, close anyhow?"), gs_nFrames);
         if ( wxMessageBox(msg, "Please confirm",
                           wxICON_QUESTION | wxYES_NO) != wxYES )
         {
@@ -205,7 +219,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
                                     wxDEFAULT_FRAME_STYLE);
 
     wxString title;
-    title.Printf("Canvas Frame %d", ++gs_nFrames);
+    title.Printf(_T("Canvas Frame %d"), ++gs_nFrames);
 
     subframe->SetTitle(title);
 
@@ -225,8 +239,11 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
 
     wxMenu *option_menu = new wxMenu;
 
-    // Dummy option
     option_menu->Append(MDI_REFRESH, "&Refresh picture");
+    option_menu->Append(MDI_CHANGE_TITLE, "Change &title...\tCtrl-T");
+    option_menu->AppendSeparator();
+    option_menu->Append(MDI_CHANGE_POSITION, "Move frame\tCtrl-M");
+    option_menu->Append(MDI_CHANGE_SIZE, "Resize frame\tCtrl-S");
 
     wxMenu *help_menu = new wxMenu;
     help_menu->Append(MDI_ABOUT, "&About");
@@ -234,12 +251,15 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
     wxMenuBar *menu_bar = new wxMenuBar;
 
     menu_bar->Append(file_menu, "&File");
-    menu_bar->Append(option_menu, "&Options");
+    menu_bar->Append(option_menu, "&Child");
     menu_bar->Append(help_menu, "&Help");
 
     // Associate the menu bar with the frame
     subframe->SetMenuBar(menu_bar);
 
+    subframe->CreateStatusBar();
+    subframe->SetStatusText(title);
+
     int width, height;
     subframe->GetClientSize(&width, &height);
     MyCanvas *canvas = new MyCanvas(subframe, wxPoint(0, 0), wxSize(width, height));
@@ -249,13 +269,10 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
     // Give it scrollbars
     canvas->SetScrollbars(20, 20, 50, 50);
 
-    subframe->CreateStatusBar();
-    subframe->SetStatusText(title);
-
     subframe->Show(TRUE);
 }
 
-void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event) )
+void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event))
 {
     int w, h;
     GetClientSize(&w, &h);
@@ -349,7 +366,9 @@ void MyCanvas::OnDraw(wxDC& dc)
     dc.DrawRoundedRectangle(150, 150, 100, 50, 20);
 
     dc.DrawEllipse(250, 250, 100, 50);
+#if wxUSE_SPLINES
     dc.DrawSpline(50, 200, 50, 100, 200, 10);
+#endif // wxUSE_SPLINES
     dc.DrawLine(50, 230, 200, 230);
     dc.DrawText("This is a test string", 50, 230);
 
@@ -405,9 +424,35 @@ void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event))
     Close(TRUE);
 }
 
-void MyChild::OnRefresh(wxCommandEvent& event)
+void MyChild::OnRefresh(wxCommandEvent& WXUNUSED(event))
+{
+    if ( canvas )
+        canvas->Refresh();
+}
+
+void MyChild::OnChangePosition(wxCommandEvent& WXUNUSED(event))
+{
+    Move(10, 10);
+}
+
+void MyChild::OnChangeSize(wxCommandEvent& WXUNUSED(event))
+{
+    SetClientSize(100, 100);
+}
+
+void MyChild::OnChangeTitle(wxCommandEvent& WXUNUSED(event))
 {
-    Refresh();
+    static wxString s_title = _T("Canvas Frame");
+
+    wxString title = wxGetTextFromUser(_T("Enter the new title for MDI child"),
+                                       _T("MDI sample question"),
+                                       s_title,
+                                       GetParent()->GetParent());
+    if ( !title )
+        return;
+
+    s_title = title;
+    SetTitle(s_title);
 }
 
 void MyChild::OnActivate(wxActivateEvent& event)
@@ -416,6 +461,33 @@ void MyChild::OnActivate(wxActivateEvent& event)
         canvas->SetFocus();
 }
 
+void MyChild::OnMove(wxMoveEvent& event)
+{
+    // VZ: here everything is totally wrong under MSW, the positions are
+    //     different and both wrong (pos2 is off by 2 pixels for me which seems
+    //     to be the width of the MDI canvas border)
+    wxPoint pos1 = event.GetPosition(),
+            pos2 = GetPosition();
+    wxLogStatus("position from event: (%d, %d), from frame (%d, %d)",
+                pos1.x, pos1.y, pos2.x, pos2.y);
+
+    event.Skip();
+}
+
+void MyChild::OnSize(wxSizeEvent& event)
+{
+    // VZ: under MSW the size event carries the client size (quite
+    //     unexpectedly) *except* for the very first one which has the full
+    //     size... what should it really be? TODO: check under wxGTK
+    wxSize size1 = event.GetSize(),
+           size2 = GetSize(),
+           size3 = GetClientSize();
+    wxLogStatus("size from event: %dx%d, from frame %dx%d, client %dx%d",
+                size1.x, size1.y, size2.x, size2.y, size3.x, size3.y);
+
+    event.Skip();
+}
+
 void MyChild::OnClose(wxCloseEvent& event)
 {
     if ( canvas && canvas->IsDirty() )