printf() format warning fixed

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

diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp
index ccfef44cec48f8b1d13912a62754045e6aff57c4..a7ecbfd0e829dbc0832d435af645a5a9cb2a6f87 100644 (file)
--- a/samples/splitter/splitter.cpp
+++ b/samples/splitter/splitter.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 


@@ -25,10 +25,19 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/wx.h"
+    #include "wx/log.h"
+
+    #include "wx/app.h"
+    #include "wx/frame.h"
+
+    #include "wx/scrolwin.h"
+    #include "wx/menu.h"
+
+    #include "wx/textdlg.h"       // for wxGetTextFromUser

 #endif
 
 #include "wx/splitter.h"
 #endif
 
 #include "wx/splitter.h"

+#include "wx/dc.h"

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


@@ -42,6 +51,7 @@ enum
     SPLIT_VERTICAL,
     SPLIT_UNSPLIT,
     SPLIT_LIVE,
     SPLIT_VERTICAL,
     SPLIT_UNSPLIT,
     SPLIT_LIVE,

+    SPLIT_SETPOSITION,

     SPLIT_SETMINSIZE
 };
 
     SPLIT_SETMINSIZE
 };
 


@@ -66,6 +76,7 @@ public:
     void SplitVertical(wxCommandEvent& event);
     void Unsplit(wxCommandEvent& event);
     void ToggleLive(wxCommandEvent& event);
     void SplitVertical(wxCommandEvent& event);
     void Unsplit(wxCommandEvent& event);
     void ToggleLive(wxCommandEvent& event);

+    void SetPosition(wxCommandEvent& event);

     void SetMinSize(wxCommandEvent& event);
 
     void Quit(wxCommandEvent& event);
     void SetMinSize(wxCommandEvent& event);
 
     void Quit(wxCommandEvent& event);


@@ -138,6 +149,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(SPLIT_HORIZONTAL, MyFrame::SplitHorizontal)
     EVT_MENU(SPLIT_UNSPLIT, MyFrame::Unsplit)
     EVT_MENU(SPLIT_LIVE, MyFrame::ToggleLive)
     EVT_MENU(SPLIT_HORIZONTAL, MyFrame::SplitHorizontal)
     EVT_MENU(SPLIT_UNSPLIT, MyFrame::Unsplit)
     EVT_MENU(SPLIT_LIVE, MyFrame::ToggleLive)

+    EVT_MENU(SPLIT_SETPOSITION, MyFrame::SetPosition)

     EVT_MENU(SPLIT_SETMINSIZE, MyFrame::SetMinSize)
 
     EVT_MENU(SPLIT_QUIT, MyFrame::Quit)
     EVT_MENU(SPLIT_SETMINSIZE, MyFrame::SetMinSize)
 
     EVT_MENU(SPLIT_QUIT, MyFrame::Quit)


@@ -156,18 +168,33 @@ MyFrame::MyFrame()
     CreateStatusBar(2);
 
     // Make a menubar
     CreateStatusBar(2);
 
     // Make a menubar

-    wxMenu *fileMenu = new wxMenu;
-    fileMenu->Append(SPLIT_VERTICAL, _T("Split &Vertically\tCtrl-V"), _T("Split vertically"));
-    fileMenu->Append(SPLIT_HORIZONTAL, _T("Split &Horizontally\tCtrl-H"), _T("Split horizontally"));
-    fileMenu->Append(SPLIT_UNSPLIT, _T("&Unsplit\tCtrl-U"), _T("Unsplit"));
-    fileMenu->AppendSeparator();
-    fileMenu->Append(SPLIT_LIVE, _T("&Live update"), _T("Toggle live update mode"), TRUE);
-    fileMenu->Append(SPLIT_SETMINSIZE, _T("Set &min size"), _T("Set minimum pane size"));
-    fileMenu->AppendSeparator();
-    fileMenu->Append(SPLIT_QUIT, _T("E&xit\tAlt-X"), _T("Exit"));
+    wxMenu *splitMenu = new wxMenu;
+    splitMenu->Append(SPLIT_VERTICAL,
+                      _T("Split &Vertically\tCtrl-V"),
+                      _T("Split vertically"));
+    splitMenu->Append(SPLIT_HORIZONTAL,
+                      _T("Split &Horizontally\tCtrl-H"),
+                      _T("Split horizontally"));
+    splitMenu->Append(SPLIT_UNSPLIT,
+                      _T("&Unsplit\tCtrl-U"),
+                      _T("Unsplit"));
+    splitMenu->AppendSeparator();
+
+    splitMenu->AppendCheckItem(SPLIT_LIVE,
+                               _T("&Live update\tCtrl-L"),
+                               _T("Toggle live update mode"));
+    splitMenu->Append(SPLIT_SETPOSITION,
+                      _T("Set splitter &position\tCtrl-P"),
+                      _T("Set the splitter position"));
+    splitMenu->Append(SPLIT_SETMINSIZE,
+                      _T("Set &min size\tCtrl-M"),
+                      _T("Set minimum pane size"));
+    splitMenu->AppendSeparator();
+
+    splitMenu->Append(SPLIT_QUIT, _T("E&xit\tAlt-X"), _T("Exit"));

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

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

 
     SetMenuBar(menuBar);
 
 
     SetMenuBar(menuBar);
 


@@ -251,17 +278,37 @@ void MyFrame::ToggleLive(wxCommandEvent& event )
     m_splitter->SetWindowStyleFlag(style);
 }
 
     m_splitter->SetWindowStyleFlag(style);
 }
 

+void MyFrame::SetPosition(wxCommandEvent& WXUNUSED(event) )
+{
+    wxString str;
+    str.Printf( wxT("%d"), m_splitter->GetSashPosition());
+    str = wxGetTextFromUser(_T("Enter splitter position:"), _T(""), str, this);
+    if ( str.empty() )
+        return;
+
+    long pos;
+    if ( !str.ToLong(&pos) )
+    {
+        wxLogError(_T("The splitter position should be an integer."));
+        return;
+    }
+
+    m_splitter->SetSashPosition(pos);
+
+    wxLogStatus(this, _T("Splitter position set to %ld"), pos);
+}
+

 void MyFrame::SetMinSize(wxCommandEvent& WXUNUSED(event) )
 {
     wxString str;
 void MyFrame::SetMinSize(wxCommandEvent& WXUNUSED(event) )
 {
     wxString str;

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

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

-    if ( str.IsEmpty() )
+    if ( str.empty() )

         return;
 
     int minsize = wxStrtol( str, (wxChar**)NULL, 10 );
     m_splitter->SetMinimumPaneSize(minsize);
         return;
 
     int minsize = wxStrtol( str, (wxChar**)NULL, 10 );
     m_splitter->SetMinimumPaneSize(minsize);

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

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