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 423a2447bee7b6b8d7fbd5906829ad79dcb61ede..6e84cdb231e7ebfdd15dc0f6684ced229a0ff0f0 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -31,7 +31,7 @@
 
 #include <wx/toolbar.h>
 
 
 #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"
     #include "mondrian.xpm"
     #include "bitmaps/new.xpm"
     #include "bitmaps/open.xpm"


@@ -81,6 +81,11 @@ 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_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()
 
     EVT_CLOSE(MyChild::OnClose)
 END_EVENT_TABLE()


@@ -236,6 +241,9 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
 
     option_menu->Append(MDI_REFRESH, "&Refresh picture");
     option_menu->Append(MDI_CHANGE_TITLE, "Change &title...\tCtrl-T");
 
     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");
 
     wxMenu *help_menu = new wxMenu;
     help_menu->Append(MDI_ABOUT, "&About");


@@ -243,7 +251,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
     wxMenuBar *menu_bar = new wxMenuBar;
 
     menu_bar->Append(file_menu, "&File");
     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
     menu_bar->Append(help_menu, "&Help");
 
     // Associate the menu bar with the frame


@@ -422,6 +430,16 @@ void MyChild::OnRefresh(wxCommandEvent& WXUNUSED(event))
         canvas->Refresh();
 }
 
         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))
 {
     static wxString s_title = _T("Canvas Frame");
 void MyChild::OnChangeTitle(wxCommandEvent& WXUNUSED(event))
 {
     static wxString s_title = _T("Canvas Frame");


@@ -443,6 +461,33 @@ void MyChild::OnActivate(wxActivateEvent& event)
         canvas->SetFocus();
 }
 
         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() )
 void MyChild::OnClose(wxCloseEvent& event)
 {
     if ( canvas && canvas->IsDirty() )