CW5.2 Pro Adaptions, wxMac starting to move in

[wxWidgets.git] / samples / splitter / test.cpp

diff --git a/samples/splitter/test.cpp b/samples/splitter/test.cpp
index 928ab3214213fb967312c41151237086a48c5ec0..d443b1ad6728e47daa9669a031147a256c0aa675 100644 (file)
--- a/samples/splitter/test.cpp
+++ b/samples/splitter/test.cpp
@@ -35,7 +35,8 @@ public:
 class MySplitterWindow : public wxSplitterWindow
 {
 public:
 class MySplitterWindow : public wxSplitterWindow
 {
 public:

-  MySplitterWindow(wxFrame *parent, wxWindowID id) : wxSplitterWindow(parent, id)
+  MySplitterWindow(wxFrame *parent, wxWindowID id) 
+    : wxSplitterWindow(parent, id, wxDefaultPosition, wxDefaultSize, wxSP_3D | wxSP_LIVE_UPDATE)

   {
     m_frame = parent;
   }
   {
     m_frame = parent;
   }


@@ -46,7 +47,7 @@ public:
       return FALSE;
     
     wxString str;
       return FALSE;
     
     wxString str;

-    str.Printf("Sash position = %d", newSashPosition);
+    str.Printf( _T("Sash position = %d"), newSashPosition);

     m_frame->SetStatusText(str);
 
     return TRUE;
     m_frame->SetStatusText(str);
 
     return TRUE;


@@ -89,7 +90,7 @@ DECLARE_EVENT_TABLE()
 class MyCanvas: public wxScrolledWindow
 {
 public:
 class MyCanvas: public wxScrolledWindow
 {
 public:

-       MyCanvas(wxWindow* parent, wxWindowID id, int x, int y, int w, int h);
+       MyCanvas(wxWindow* parent, wxWindowID id, int x, int y, int w, int h, const wxString &name);

        virtual ~MyCanvas();
 
   virtual void OnDraw(wxDC& dc);
        virtual ~MyCanvas();
 
   virtual void OnDraw(wxDC& dc);


@@ -165,13 +166,16 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, cons
   SetMenuBar(menuBar);
 
   m_splitter = new MySplitterWindow(this, SPLITTER_WINDOW);
   SetMenuBar(menuBar);
 
   m_splitter = new MySplitterWindow(this, SPLITTER_WINDOW);

+  
+  wxSize sz( m_splitter->GetSize() );
+  wxLogMessage( "Initial splitter size: %d %d\n", (int)sz.x, (int)sz.y );

 
 

-  m_leftCanvas = new MyCanvas(m_splitter, CANVAS1, 0, 0, 400, 400);
+  m_leftCanvas = new MyCanvas(m_splitter, CANVAS1, 0, 0, 400, 400, "Test1" );

   m_leftCanvas->SetBackgroundColour(*wxRED);
   m_leftCanvas->SetScrollbars(20, 20, 50, 50);
   m_leftCanvas->SetCursor(wxCursor(wxCURSOR_MAGNIFIER));
 
   m_leftCanvas->SetBackgroundColour(*wxRED);
   m_leftCanvas->SetScrollbars(20, 20, 50, 50);
   m_leftCanvas->SetCursor(wxCursor(wxCURSOR_MAGNIFIER));
 

-  m_rightCanvas = new MyCanvas(m_splitter, CANVAS2, 0, 0, 400, 400);
+  m_rightCanvas = new MyCanvas(m_splitter, CANVAS2, 0, 0, 400, 400, "Test2" );

   m_rightCanvas->SetBackgroundColour(*wxCYAN);
   m_rightCanvas->SetScrollbars(20, 20, 50, 50);
   m_rightCanvas->Show(FALSE);
   m_rightCanvas->SetBackgroundColour(*wxCYAN);
   m_rightCanvas->SetScrollbars(20, 20, 50, 50);
   m_rightCanvas->Show(FALSE);


@@ -219,14 +223,14 @@ void MyFrame::Unsplit(wxCommandEvent& WXUNUSED(event) )
 void MyFrame::SetMinSize(wxCommandEvent& WXUNUSED(event) )
 {
   wxString str;
 void MyFrame::SetMinSize(wxCommandEvent& WXUNUSED(event) )
 {
   wxString str;

-  str.Printf("%d", m_splitter->GetMinimumPaneSize());
+  str.Printf( _T("%d"), m_splitter->GetMinimumPaneSize());

   str = wxGetTextFromUser("Enter minimal size for panes:", "", str, this);
   if ( str.IsEmpty() )
     return;
 
   str = wxGetTextFromUser("Enter minimal size for panes:", "", str, this);
   if ( str.IsEmpty() )
     return;
 

-  int minsize = atoi(str);
+  int minsize = wxStrtol( str, (wxChar**)NULL, 10 );

   m_splitter->SetMinimumPaneSize(minsize);
   m_splitter->SetMinimumPaneSize(minsize);

-  str.Printf("Min pane size = %d", minsize);
+  str.Printf( _T("Min pane size = %d"), minsize);

   SetStatusText(str, 1);
 }
 
   SetStatusText(str, 1);
 }
 


@@ -248,12 +252,12 @@ void MyFrame::UpdateUIUnsplit(wxUpdateUIEvent& event)
 void MyFrame::UpdatePosition()
 {
   wxString str;
 void MyFrame::UpdatePosition()
 {
   wxString str;

-  str.Printf("Sash position = %d", m_splitter->GetSashPosition());
+  str.Printf( _("Sash position = %d"), m_splitter->GetSashPosition());

   SetStatusText(str);
 }
 
   SetStatusText(str);
 }
 

-MyCanvas::MyCanvas(wxWindow* parent, wxWindowID id, int x, int y, int w, int h) :
-       wxScrolledWindow(parent, id, wxPoint(x, y), wxSize(w, h))
+MyCanvas::MyCanvas(wxWindow* parent, wxWindowID id, int x, int y, int w, int h, const wxString &name ) :
+       wxScrolledWindow(parent, id, wxPoint(x, y), wxSize(w, h), 0, name )

 {
 }
 
 {
 }