Fix discrepancy between different ways of measuring text extents under Mac.

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

diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp
index b95e2e75ed0f56c1ffd284320af1e9ea984d5aae..0b046d33cbd69f834dba6a0563956dd573de17a4 100644 (file)
--- a/samples/splitter/splitter.cpp
+++ b/samples/splitter/splitter.cpp
@@ -39,6 +39,10 @@
 #include "wx/splitter.h"
 #include "wx/dcmirror.h"
 
 #include "wx/splitter.h"
 #include "wx/dcmirror.h"
 

+#ifndef __WXMSW__
+    #include "../sample.xpm"
+#endif
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -70,7 +74,7 @@ public:
 
     virtual bool OnInit();
 
 
     virtual bool OnInit();
 

-    DECLARE_NO_COPY_CLASS(MyApp)
+    wxDECLARE_NO_COPY_CLASS(MyApp);

 };
 
 class MyFrame: public wxFrame
 };
 
 class MyFrame: public wxFrame


@@ -110,7 +114,7 @@ private:
     wxWindow *m_replacewindow;
 
     DECLARE_EVENT_TABLE()
     wxWindow *m_replacewindow;
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(MyFrame)
+    wxDECLARE_NO_COPY_CLASS(MyFrame);

 };
 
 class MySplitterWindow : public wxSplitterWindow
 };
 
 class MySplitterWindow : public wxSplitterWindow


@@ -128,7 +132,7 @@ private:
     wxFrame *m_frame;
 
     DECLARE_EVENT_TABLE()
     wxFrame *m_frame;
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(MySplitterWindow)
+    wxDECLARE_NO_COPY_CLASS(MySplitterWindow);

 };
 
 class MyCanvas: public wxScrolledWindow
 };
 
 class MyCanvas: public wxScrolledWindow


@@ -142,7 +146,7 @@ public:
 private:
     bool m_mirror;
 
 private:
     bool m_mirror;
 

-    DECLARE_NO_COPY_CLASS(MyCanvas)
+    wxDECLARE_NO_COPY_CLASS(MyCanvas);

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -193,10 +197,12 @@ END_EVENT_TABLE()
 
 // My frame constructor
 MyFrame::MyFrame()
 
 // My frame constructor
 MyFrame::MyFrame()

-       : wxFrame(NULL, wxID_ANY, _T("wxSplitterWindow sample"),
+       : wxFrame(NULL, wxID_ANY, wxT("wxSplitterWindow sample"),

                  wxDefaultPosition, wxSize(420, 300),
                  wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
 {
                  wxDefaultPosition, wxSize(420, 300),
                  wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
 {

+    SetIcon(wxICON(sample));
+

 #if wxUSE_STATUSBAR
     CreateStatusBar(2);
 #endif // wxUSE_STATUSBAR
 #if wxUSE_STATUSBAR
     CreateStatusBar(2);
 #endif // wxUSE_STATUSBAR


@@ -204,47 +210,47 @@ MyFrame::MyFrame()
     // Make a menubar
     wxMenu *splitMenu = new wxMenu;
     splitMenu->Append(SPLIT_VERTICAL,
     // Make a menubar
     wxMenu *splitMenu = new wxMenu;
     splitMenu->Append(SPLIT_VERTICAL,

-                      _T("Split &Vertically\tCtrl-V"),
-                      _T("Split vertically"));
+                      wxT("Split &Vertically\tCtrl-V"),
+                      wxT("Split vertically"));

     splitMenu->Append(SPLIT_HORIZONTAL,
     splitMenu->Append(SPLIT_HORIZONTAL,

-                      _T("Split &Horizontally\tCtrl-H"),
-                      _T("Split horizontally"));
+                      wxT("Split &Horizontally\tCtrl-H"),
+                      wxT("Split horizontally"));

     splitMenu->Append(SPLIT_UNSPLIT,
     splitMenu->Append(SPLIT_UNSPLIT,

-                      _T("&Unsplit\tCtrl-U"),
-                      _T("Unsplit"));
+                      wxT("&Unsplit\tCtrl-U"),
+                      wxT("Unsplit"));

     splitMenu->AppendSeparator();
 
     splitMenu->AppendCheckItem(SPLIT_LIVE,
     splitMenu->AppendSeparator();
 
     splitMenu->AppendCheckItem(SPLIT_LIVE,

-                               _T("&Live update\tCtrl-L"),
-                               _T("Toggle live update mode"));
+                               wxT("&Live update\tCtrl-L"),
+                               wxT("Toggle live update mode"));

     splitMenu->AppendCheckItem(SPLIT_BORDER,
     splitMenu->AppendCheckItem(SPLIT_BORDER,

-                               _T("3D &Border"),
-                               _T("Toggle wxSP_BORDER flag"));
+                               wxT("3D &Border"),
+                               wxT("Toggle wxSP_BORDER flag"));

     splitMenu->Check(SPLIT_BORDER, true);
     splitMenu->AppendCheckItem(SPLIT_3DSASH,
     splitMenu->Check(SPLIT_BORDER, true);
     splitMenu->AppendCheckItem(SPLIT_3DSASH,

-                               _T("&3D Sash"),
-                               _T("Toggle wxSP_3DSASH flag"));
+                               wxT("&3D Sash"),
+                               wxT("Toggle wxSP_3DSASH flag"));

     splitMenu->Check(SPLIT_3DSASH, true);
     splitMenu->Append(SPLIT_SETPOSITION,
     splitMenu->Check(SPLIT_3DSASH, true);
     splitMenu->Append(SPLIT_SETPOSITION,

-                      _T("Set splitter &position\tCtrl-P"),
-                      _T("Set the splitter position"));
+                      wxT("Set splitter &position\tCtrl-P"),
+                      wxT("Set the splitter position"));

     splitMenu->Append(SPLIT_SETMINSIZE,
     splitMenu->Append(SPLIT_SETMINSIZE,

-                      _T("Set &min size\tCtrl-M"),
-                      _T("Set minimum pane size"));
+                      wxT("Set &min size\tCtrl-M"),
+                      wxT("Set minimum pane size"));

     splitMenu->Append(SPLIT_SETGRAVITY,
     splitMenu->Append(SPLIT_SETGRAVITY,

-                      _T("Set &gravity\tCtrl-G"),
-                      _T("Set gravity of sash"));
+                      wxT("Set &gravity\tCtrl-G"),
+                      wxT("Set gravity of sash"));

     splitMenu->AppendSeparator();
 
     splitMenu->Append(SPLIT_REPLACE,
     splitMenu->AppendSeparator();
 
     splitMenu->Append(SPLIT_REPLACE,

-                      _T("&Replace right window"),
-                      _T("Replace right window"));
+                      wxT("&Replace right window"),
+                      wxT("Replace right window"));

     splitMenu->AppendSeparator();
 
     splitMenu->AppendSeparator();
 

-    splitMenu->Append(SPLIT_QUIT, _T("E&xit\tAlt-X"), _T("Exit"));
+    splitMenu->Append(SPLIT_QUIT, wxT("E&xit\tAlt-X"), wxT("Exit"));

 
     wxMenuBar *menuBar = new wxMenuBar;
 
     wxMenuBar *menuBar = new wxMenuBar;

-    menuBar->Append(splitMenu, _T("&Splitter"));
+    menuBar->Append(splitMenu, wxT("&Splitter"));

 
     SetMenuBar(menuBar);
 
 
     SetMenuBar(menuBar);
 


@@ -263,8 +269,8 @@ MyFrame::MyFrame()
     m_right->SetBackgroundColour(*wxCYAN);
     m_right->SetScrollbars(20, 20, 5, 5);
 #else // for testing kbd navigation inside the splitter
     m_right->SetBackgroundColour(*wxCYAN);
     m_right->SetScrollbars(20, 20, 5, 5);
 #else // for testing kbd navigation inside the splitter

-    m_left = new wxTextCtrl(m_splitter, wxID_ANY, _T("first text"));
-    m_right = new wxTextCtrl(m_splitter, wxID_ANY, _T("second text"));
+    m_left = new wxTextCtrl(m_splitter, wxID_ANY, wxT("first text"));
+    m_right = new wxTextCtrl(m_splitter, wxID_ANY, wxT("second text"));

 #endif
 
     // you can also do this to start with a single window
 #endif
 
     // you can also do this to start with a single window


@@ -277,17 +283,16 @@ MyFrame::MyFrame()
 #endif
 
 #if wxUSE_STATUSBAR
 #endif
 
 #if wxUSE_STATUSBAR

-    SetStatusText(_T("Min pane size = 0"), 1);
+    SetStatusText(wxT("Min pane size = 0"), 1);

 #endif // wxUSE_STATUSBAR
 
 #endif // wxUSE_STATUSBAR
 

-    m_replacewindow = (wxWindow *)0;
+    m_replacewindow = NULL;

 }
 
 MyFrame::~MyFrame()
 {
     if (m_replacewindow) {
         m_replacewindow->Destroy();
 }
 
 MyFrame::~MyFrame()
 {
     if (m_replacewindow) {
         m_replacewindow->Destroy();

-        m_replacewindow = (wxWindow *)0;

     }
 }
 
     }
 }
 


@@ -305,9 +310,10 @@ void MyFrame::OnSplitHorizontal(wxCommandEvent& WXUNUSED(event) )
     m_left->Show(true);
     m_right->Show(true);
     m_splitter->SplitHorizontally( m_left, m_right );
     m_left->Show(true);
     m_right->Show(true);
     m_splitter->SplitHorizontally( m_left, m_right );

+    m_replacewindow = NULL;

 
 #if wxUSE_STATUSBAR
 
 #if wxUSE_STATUSBAR

-    SetStatusText(_T("Splitter split horizontally"), 1);
+    SetStatusText(wxT("Splitter split horizontally"), 1);

 #endif // wxUSE_STATUSBAR
 }
 
 #endif // wxUSE_STATUSBAR
 }
 


@@ -318,9 +324,10 @@ void MyFrame::OnSplitVertical(wxCommandEvent& WXUNUSED(event) )
     m_left->Show(true);
     m_right->Show(true);
     m_splitter->SplitVertically( m_left, m_right );
     m_left->Show(true);
     m_right->Show(true);
     m_splitter->SplitVertically( m_left, m_right );

+    m_replacewindow = NULL;

 
 #if wxUSE_STATUSBAR
 
 #if wxUSE_STATUSBAR

-    SetStatusText(_T("Splitter split vertically"), 1);
+    SetStatusText(wxT("Splitter split vertically"), 1);

 #endif // wxUSE_STATUSBAR
 }
 
 #endif // wxUSE_STATUSBAR
 }
 


@@ -329,7 +336,7 @@ void MyFrame::OnUnsplit(wxCommandEvent& WXUNUSED(event) )
     if ( m_splitter->IsSplit() )
         m_splitter->Unsplit();
 #if wxUSE_STATUSBAR
     if ( m_splitter->IsSplit() )
         m_splitter->Unsplit();
 #if wxUSE_STATUSBAR

-    SetStatusText(_T("No splitter"));
+    SetStatusText(wxT("No splitter"));

 #endif // wxUSE_STATUSBAR
 }
 
 #endif // wxUSE_STATUSBAR
 }
 


@@ -354,7 +361,7 @@ void MyFrame::OnSetPosition(wxCommandEvent& WXUNUSED(event) )
     wxString str;
     str.Printf( wxT("%d"), m_splitter->GetSashPosition());
 #if wxUSE_TEXTDLG
     wxString str;
     str.Printf( wxT("%d"), m_splitter->GetSashPosition());
 #if wxUSE_TEXTDLG

-    str = wxGetTextFromUser(_T("Enter splitter position:"), _T(""), str, this);
+    str = wxGetTextFromUser(wxT("Enter splitter position:"), wxT(""), str, this);

 #endif
     if ( str.empty() )
         return;
 #endif
     if ( str.empty() )
         return;


@@ -362,13 +369,13 @@ void MyFrame::OnSetPosition(wxCommandEvent& WXUNUSED(event) )
     long pos;
     if ( !str.ToLong(&pos) )
     {
     long pos;
     if ( !str.ToLong(&pos) )
     {

-        wxLogError(_T("The splitter position should be an integer."));
+        wxLogError(wxT("The splitter position should be an integer."));

         return;
     }
 
     m_splitter->SetSashPosition(pos);
 
         return;
     }
 
     m_splitter->SetSashPosition(pos);
 

-    wxLogStatus(this, _T("Splitter position set to %ld"), pos);
+    wxLogStatus(this, wxT("Splitter position set to %ld"), pos);

 }
 
 void MyFrame::OnSetMinSize(wxCommandEvent& WXUNUSED(event) )
 }
 
 void MyFrame::OnSetMinSize(wxCommandEvent& WXUNUSED(event) )


@@ -376,7 +383,7 @@ void MyFrame::OnSetMinSize(wxCommandEvent& WXUNUSED(event) )
     wxString str;
     str.Printf( wxT("%d"), m_splitter->GetMinimumPaneSize());
 #if wxUSE_TEXTDLG
     wxString str;
     str.Printf( wxT("%d"), m_splitter->GetMinimumPaneSize());
 #if wxUSE_TEXTDLG

-    str = wxGetTextFromUser(_T("Enter minimal size for panes:"), _T(""), str, this);
+    str = wxGetTextFromUser(wxT("Enter minimal size for panes:"), wxT(""), str, this);

 #endif
     if ( str.empty() )
         return;
 #endif
     if ( str.empty() )
         return;


@@ -394,7 +401,7 @@ void MyFrame::OnSetGravity(wxCommandEvent& WXUNUSED(event) )
     wxString str;
     str.Printf( wxT("%g"), m_splitter->GetSashGravity());
 #if wxUSE_TEXTDLG
     wxString str;
     str.Printf( wxT("%g"), m_splitter->GetSashGravity());
 #if wxUSE_TEXTDLG

-    str = wxGetTextFromUser(_T("Enter sash gravity (0,1):"), _T(""), str, this);
+    str = wxGetTextFromUser(wxT("Enter sash gravity (0,1):"), wxT(""), str, this);

 #endif
     if ( str.empty() )
         return;
 #endif
     if ( str.empty() )
         return;


@@ -409,15 +416,16 @@ void MyFrame::OnSetGravity(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnReplace(wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::OnReplace(wxCommandEvent& WXUNUSED(event) )
 {

-    if (m_replacewindow == 0) {
+    if (m_replacewindow == NULL) {

         m_replacewindow = m_splitter->GetWindow2();
         m_splitter->ReplaceWindow(m_replacewindow, new wxPanel(m_splitter, wxID_ANY));
         m_replacewindow->Hide();
     } else {
         wxWindow *empty = m_splitter->GetWindow2();
         m_replacewindow = m_splitter->GetWindow2();
         m_splitter->ReplaceWindow(m_replacewindow, new wxPanel(m_splitter, wxID_ANY));
         m_replacewindow->Hide();
     } else {
         wxWindow *empty = m_splitter->GetWindow2();

+        wxASSERT(empty != m_replacewindow);

         m_splitter->ReplaceWindow(empty, m_replacewindow);
         m_replacewindow->Show();
         m_splitter->ReplaceWindow(empty, m_replacewindow);
         m_replacewindow->Show();

-        m_replacewindow = 0;
+        m_replacewindow = NULL;

         empty->Destroy();
     }
 }
         empty->Destroy();
     }
 }


@@ -463,7 +471,7 @@ MySplitterWindow::MySplitterWindow(wxFrame *parent)
 
 void MySplitterWindow::OnPositionChanged(wxSplitterEvent& event)
 {
 
 void MySplitterWindow::OnPositionChanged(wxSplitterEvent& event)
 {

-    wxLogStatus(m_frame, _T("Position has changed, now = %d (or %d)"),
+    wxLogStatus(m_frame, wxT("Position has changed, now = %d (or %d)"),

                 event.GetSashPosition(), GetSashPosition());
 
     event.Skip();
                 event.GetSashPosition(), GetSashPosition());
 
     event.Skip();


@@ -471,7 +479,7 @@ void MySplitterWindow::OnPositionChanged(wxSplitterEvent& event)
 
 void MySplitterWindow::OnPositionChanging(wxSplitterEvent& event)
 {
 
 void MySplitterWindow::OnPositionChanging(wxSplitterEvent& event)
 {

-    wxLogStatus(m_frame, _T("Position is changing, now = %d (or %d)"),
+    wxLogStatus(m_frame, wxT("Position is changing, now = %d (or %d)"),

                 event.GetSashPosition(), GetSashPosition());
 
     event.Skip();
                 event.GetSashPosition(), GetSashPosition());
 
     event.Skip();


@@ -480,7 +488,7 @@ void MySplitterWindow::OnPositionChanging(wxSplitterEvent& event)
 void MySplitterWindow::OnDClick(wxSplitterEvent& event)
 {
 #if wxUSE_STATUSBAR
 void MySplitterWindow::OnDClick(wxSplitterEvent& event)
 {
 #if wxUSE_STATUSBAR

-    m_frame->SetStatusText(_T("Splitter double clicked"), 1);
+    m_frame->SetStatusText(wxT("Splitter double clicked"), 1);

 #endif // wxUSE_STATUSBAR
 
     event.Skip();
 #endif // wxUSE_STATUSBAR
 
     event.Skip();


@@ -489,7 +497,7 @@ void MySplitterWindow::OnDClick(wxSplitterEvent& event)
 void MySplitterWindow::OnUnsplitEvent(wxSplitterEvent& event)
 {
 #if wxUSE_STATUSBAR
 void MySplitterWindow::OnUnsplitEvent(wxSplitterEvent& event)
 {
 #if wxUSE_STATUSBAR

-    m_frame->SetStatusText(_T("Splitter unsplit"), 1);
+    m_frame->SetStatusText(wxT("Splitter unsplit"), 1);

 #endif // wxUSE_STATUSBAR
 
     event.Skip();
 #endif // wxUSE_STATUSBAR
 
     event.Skip();


@@ -514,7 +522,7 @@ void MyCanvas::OnDraw(wxDC& dcOrig)
     dc.DrawLine(0, 0, 100, 200);
 
     dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
     dc.DrawLine(0, 0, 100, 200);
 
     dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);

-    dc.DrawText(_T("Testing"), 50, 50);
+    dc.DrawText(wxT("Testing"), 50, 50);

 
     dc.SetPen(*wxRED_PEN);
     dc.SetBrush(*wxGREEN_BRUSH);
 
     dc.SetPen(*wxRED_PEN);
     dc.SetBrush(*wxGREEN_BRUSH);