Sizing/scrollbar corrections for Mac

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/demos/forty/canvas.cpp b/demos/forty/canvas.cpp
index e2356e184aa1df6f8147a0ed118e135835828953..7a8e5fa384ad98e8049aeac228b8e6b5c4c94a2f 100644 (file)
--- a/demos/forty/canvas.cpp
+++ b/demos/forty/canvas.cpp
@@ -34,12 +34,15 @@ BEGIN_EVENT_TABLE(FortyCanvas, wxScrolledWindow)
 END_EVENT_TABLE()
 
 FortyCanvas::FortyCanvas(wxWindow* parent, const wxPoint& pos, const wxSize& size) :
 END_EVENT_TABLE()
 
 FortyCanvas::FortyCanvas(wxWindow* parent, const wxPoint& pos, const wxSize& size) :

-             wxScrolledWindow(parent, wxID_ANY, pos, size),
+             wxScrolledWindow(parent, wxID_ANY, pos, size, 0),

              m_helpingHand(true),
              m_rightBtnUndo(true),
              m_playerDialog(0),
              m_leftBtnDown(false)
 {
              m_helpingHand(true),
              m_rightBtnUndo(true),
              m_playerDialog(0),
              m_leftBtnDown(false)
 {

+    SetScrollbars(0, 0, 0, 0);
+    SetMinSize(wxSize(10,10));
+

 #ifdef __WXGTK__
     m_font = wxTheFontList->FindOrCreateFont(12, wxROMAN, wxNORMAL, wxNORMAL);
 #else
 #ifdef __WXGTK__
     m_font = wxTheFontList->FindOrCreateFont(12, wxROMAN, wxNORMAL, wxNORMAL);
 #else

diff --git a/demos/forty/forty.cpp b/demos/forty/forty.cpp
index dbd5ef01535d5223e1aba6ef539e111823fc2774..036c9429b42555e1aadc1ab8d66bcfc7acdaaafe 100644 (file)
--- a/demos/forty/forty.cpp
+++ b/demos/forty/forty.cpp
@@ -195,7 +195,6 @@ FortyFrame::FortyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
     topsizer->Add( m_canvas, 1, wxEXPAND | wxALL, 0);
     SetSizer( topsizer );
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
     topsizer->Add( m_canvas, 1, wxEXPAND | wxALL, 0);
     SetSizer( topsizer );

-    topsizer->SetSizeHints( this );

 
 #if wxUSE_STATUSBAR
     CreateStatusBar();
 
 #if wxUSE_STATUSBAR
     CreateStatusBar();