more updates for recent toolbar changes

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

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index 6ccae6ba4f00046e4327e7dc4cf97e670eeed2b3..c2415d083481f5e7b6d76b6f872b1934f6a4552b 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -29,9 +29,9 @@
     #include "wx/mdi.h"
 #endif
 
     #include "wx/mdi.h"
 #endif
 

-#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"


@@ -163,7 +163,8 @@ MyFrame::MyFrame(wxWindow *parent,
                  const wxPoint& pos,
                  const wxSize& size,
                  const long style)
                  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,
 {
     textWindow = new wxTextCtrl(this, -1, "A help window",
                                 wxDefaultPosition, wxDefaultSize,


@@ -345,7 +346,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,
 // 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"));
 
 {
     SetBackgroundColour(wxColour("WHITE"));
 


@@ -408,10 +411,14 @@ void MyCanvas::OnEvent(wxMouseEvent& event)
 MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title,
                  const wxPoint& pos, const wxSize& size,
                  const long style)
 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);
 {
     canvas = (MyCanvas *) NULL;
     my_children.Append(this);

+
+    // this should work for MDI frames as well as for normal ones
+    SetSizeHints(100, 100);

 }
 
 MyChild::~MyChild()
 }
 
 MyChild::~MyChild()


@@ -468,7 +475,7 @@ void MyChild::OnMove(wxMoveEvent& event)
     //     to be the width of the MDI canvas border)
     wxPoint pos1 = event.GetPosition(),
             pos2 = GetPosition();
     //     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();
                 pos1.x, pos1.y, pos2.x, pos2.y);
 
     event.Skip();


@@ -482,7 +489,7 @@ void MyChild::OnSize(wxSizeEvent& event)
     wxSize size1 = event.GetSize(),
            size2 = GetSize(),
            size3 = GetClientSize();
     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();
                 size1.x, size1.y, size2.x, size2.y, size3.x, size3.y);
 
     event.Skip();