documented FileNameToURL and URLToFileName

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

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index 6e84cdb231e7ebfdd15dc0f6684ced229a0ff0f0..911d25cbdb65f6f03c4e52c0b0d36bffe884f962 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -29,20 +29,22 @@
     #include "wx/mdi.h"
 #endif
 
-#include <wx/toolbar.h>
+#include "wx/toolbar.h"
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     #include "mondrian.xpm"
-    #include "bitmaps/new.xpm"
-    #include "bitmaps/open.xpm"
-    #include "bitmaps/save.xpm"
-    #include "bitmaps/copy.xpm"
-    #include "bitmaps/cut.xpm"
-    #include "bitmaps/paste.xpm"
-    #include "bitmaps/print.xpm"
-    #include "bitmaps/help.xpm"
 #endif
 
+#include "bitmaps/new.xpm"
+#include "bitmaps/open.xpm"
+#include "bitmaps/save.xpm"
+#include "bitmaps/copy.xpm"
+#include "bitmaps/cut.xpm"
+#include "bitmaps/paste.xpm"
+#include "bitmaps/print.xpm"
+#include "bitmaps/help.xpm"
+
+
 #include "mdi.h"
 
 IMPLEMENT_APP(MyApp)
@@ -163,7 +165,8 @@ MyFrame::MyFrame(wxWindow *parent,
                  const wxPoint& pos,
                  const wxSize& size,
                  const long style)
-       : wxMDIParentFrame(parent, id, title, pos, size, style)
+       : wxMDIParentFrame(parent, id, title, pos, size,
+                          style | wxNO_FULL_REPAINT_ON_RESIZE)
 {
     textWindow = new wxTextCtrl(this, -1, "A help window",
                                 wxDefaultPosition, wxDefaultSize,
@@ -272,29 +275,26 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
     subframe->Show(TRUE);
 }
 
-void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event))
+void MyFrame::OnSize(wxSizeEvent& event)
 {
     int w, h;
     GetClientSize(&w, &h);
 
     textWindow->SetSize(0, 0, 200, h);
     GetClientWindow()->SetSize(200, 0, w - 200, h);
+
+    // FIXME: On wxX11, we need the MDI frame to process this
+    // event, but on other platforms this should not
+    // be done.
+#ifdef __WXUNIVERSAL__   
+    event.Skip();
+#endif
 }
 
 void MyFrame::InitToolBar(wxToolBar* toolBar)
 {
     wxBitmap* bitmaps[8];
 
-#ifdef __WXMSW__
-    bitmaps[0] = new wxBitmap("icon1", wxBITMAP_TYPE_RESOURCE);
-    bitmaps[1] = new wxBitmap("icon2", wxBITMAP_TYPE_RESOURCE);
-    bitmaps[2] = new wxBitmap("icon3", wxBITMAP_TYPE_RESOURCE);
-    bitmaps[3] = new wxBitmap("icon4", wxBITMAP_TYPE_RESOURCE);
-    bitmaps[4] = new wxBitmap("icon5", wxBITMAP_TYPE_RESOURCE);
-    bitmaps[5] = new wxBitmap("icon6", wxBITMAP_TYPE_RESOURCE);
-    bitmaps[6] = new wxBitmap("icon7", wxBITMAP_TYPE_RESOURCE);
-    bitmaps[7] = new wxBitmap("icon8", wxBITMAP_TYPE_RESOURCE);
-#else
     bitmaps[0] = new wxBitmap( new_xpm );
     bitmaps[1] = new wxBitmap( open_xpm );
     bitmaps[2] = new wxBitmap( save_xpm );
@@ -303,13 +303,8 @@ void MyFrame::InitToolBar(wxToolBar* toolBar)
     bitmaps[5] = new wxBitmap( paste_xpm );
     bitmaps[6] = new wxBitmap( print_xpm );
     bitmaps[7] = new wxBitmap( help_xpm );
-#endif
 
-#ifdef __WXMSW__
     int width = 24;
-#else
-    int width = 16;
-#endif
     int currentX = 5;
 
     toolBar->AddTool( MDI_NEW_WINDOW, *(bitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "New file");
@@ -345,7 +340,9 @@ void MyFrame::InitToolBar(wxToolBar* toolBar)
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size)
         : wxScrolledWindow(parent, -1, pos, size,
-                           wxSUNKEN_BORDER|wxVSCROLL|wxHSCROLL)
+                           wxSUNKEN_BORDER |
+                           wxNO_FULL_REPAINT_ON_RESIZE |
+                           wxVSCROLL | wxHSCROLL)
 {
     SetBackgroundColour(wxColour("WHITE"));
 
@@ -408,10 +405,14 @@ void MyCanvas::OnEvent(wxMouseEvent& event)
 MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title,
                  const wxPoint& pos, const wxSize& size,
                  const long style)
-       : wxMDIChildFrame(parent, -1, title, pos, size, style)
+       : wxMDIChildFrame(parent, -1, title, pos, size,
+                         style | wxNO_FULL_REPAINT_ON_RESIZE)
 {
     canvas = (MyCanvas *) NULL;
     my_children.Append(this);
+
+    // this should work for MDI frames as well as for normal ones
+    SetSizeHints(100, 100);
 }
 
 MyChild::~MyChild()
@@ -442,6 +443,7 @@ void MyChild::OnChangeSize(wxCommandEvent& WXUNUSED(event))
 
 void MyChild::OnChangeTitle(wxCommandEvent& WXUNUSED(event))
 {
+//#if wxUSE_TEXTDLG
     static wxString s_title = _T("Canvas Frame");
 
     wxString title = wxGetTextFromUser(_T("Enter the new title for MDI child"),
@@ -453,6 +455,7 @@ void MyChild::OnChangeTitle(wxCommandEvent& WXUNUSED(event))
 
     s_title = title;
     SetTitle(s_title);
+//#endif
 }
 
 void MyChild::OnActivate(wxActivateEvent& event)
@@ -468,7 +471,7 @@ void MyChild::OnMove(wxMoveEvent& event)
     //     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)",
+    wxLogStatus(wxT("position from event: (%d, %d), from frame (%d, %d)"),
                 pos1.x, pos1.y, pos2.x, pos2.y);
 
     event.Skip();
@@ -482,7 +485,7 @@ void MyChild::OnSize(wxSizeEvent& event)
     wxSize size1 = event.GetSize(),
            size2 = GetSize(),
            size3 = GetClientSize();
-    wxLogStatus("size from event: %dx%d, from frame %dx%d, client %dx%d",
+    wxLogStatus(wxT("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();