fixes for new lib dirs for wxMSW

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

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index 47854b9fb9c18fd997ba33bad16be2c5eb9c117d..407143684782e8cf1562085eb7f0f2ee94dc2c2e 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -89,10 +89,10 @@ class MyFrame: public wxFrame
 public:
     MyFrame(wxFrame *parent,
             wxWindowID id = -1,
 public:
     MyFrame(wxFrame *parent,
             wxWindowID id = -1,

-            const wxString& title = "wxToolBar Sample",
+            const wxString& title = _T("wxToolBar Sample"),

             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,

-            long style = wxDEFAULT_FRAME_STYLE);
+            long style = wxDEFAULT_FRAME_STYLE|wxCLIP_CHILDREN|wxNO_FULL_REPAINT_ON_RESIZE);

 
     void RecreateToolbar();
 
 
     void RecreateToolbar();
 


@@ -140,6 +140,9 @@ private:
                         m_horzToolbar;
     size_t              m_rows;             // 1 or 2 only
 
                         m_horzToolbar;
     size_t              m_rows;             // 1 or 2 only
 

+    // the number of print buttons we have (they're added/removed dynamically)
+    size_t              m_nPrint;
+

     wxTextCtrl         *m_textWindow;
 
     wxToolBar          *m_tbar;
     wxTextCtrl         *m_textWindow;
 
     wxToolBar          *m_tbar;


@@ -153,8 +156,7 @@ private:
 
 const int ID_TOOLBAR = 500;
 
 
 const int ID_TOOLBAR = 500;
 

-static const long TOOLBAR_STYLE = wxTB_FLAT | wxTB_DOCKABLE | wxTB_TEXT ;
-// static const long TOOLBAR_STYLE = 0;
+static const long TOOLBAR_STYLE = wxTB_FLAT | wxTB_DOCKABLE | wxTB_TEXT;

 
 enum
 {
 
 enum
 {


@@ -230,12 +232,17 @@ bool MyApp::OnInit()
 {
     // Create the main frame window
     MyFrame* frame = new MyFrame((wxFrame *) NULL, -1,
 {
     // Create the main frame window
     MyFrame* frame = new MyFrame((wxFrame *) NULL, -1,

-                                 "wxToolBar Sample",
-                                 wxPoint(100, 100), wxSize(550, 300));
+                                 _T("wxToolBar Sample"),
+#ifdef __WXWINCE__
+                                 wxPoint(0, 0), wxDefaultSize, wxNO_BORDER
+#else
+                                 wxPoint(100, 100), wxSize(550, 300)
+#endif
+                                 );

 
     frame->Show(TRUE);
 
 
     frame->Show(TRUE);
 

-    frame->SetStatusText("Hello, wxWindows");
+    frame->SetStatusText(_T("Hello, wxWindows"));

 
     SetTopWindow(frame);
 
 
     SetTopWindow(frame);
 


@@ -244,6 +251,12 @@ bool MyApp::OnInit()
 
 void MyFrame::RecreateToolbar()
 {
 
 void MyFrame::RecreateToolbar()
 {

+#ifdef __WXWINCE__
+    // On Windows CE, we should not delete the
+    // previous toolbar in case it contains the menubar.
+    // We'll try to accomodate this usage in due course.
+    wxToolBar* toolBar = CreateToolBar();
+#else

     // delete and recreate the toolbar
     wxToolBarBase *toolBar = GetToolBar();
     long style = toolBar ? toolBar->GetWindowStyle() : TOOLBAR_STYLE;
     // delete and recreate the toolbar
     wxToolBarBase *toolBar = GetToolBar();
     long style = toolBar ? toolBar->GetWindowStyle() : TOOLBAR_STYLE;


@@ -254,9 +267,10 @@ void MyFrame::RecreateToolbar()
 
     style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL);
     style |= m_horzToolbar ? wxTB_HORIZONTAL : wxTB_VERTICAL;
 
     style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL);
     style |= m_horzToolbar ? wxTB_HORIZONTAL : wxTB_VERTICAL;

+    style |= wxNO_FULL_REPAINT_ON_RESIZE ;

 
     toolBar = CreateToolBar(style, ID_TOOLBAR);
 
     toolBar = CreateToolBar(style, ID_TOOLBAR);

-    //toolBar->SetMargins( 4, 4 );
+#endif

 
     // Set up toolbar
     wxBitmap toolBarBitmaps[8];
 
     // Set up toolbar
     wxBitmap toolBarBitmaps[8];


@@ -297,17 +311,17 @@ void MyFrame::RecreateToolbar()
     toolBar->AddTool(wxID_NEW, _T("New"), toolBarBitmaps[0], _T("New file"));
     toolBar->AddTool(wxID_OPEN, _T("Open"), toolBarBitmaps[1], _T("Open file"));
 
     toolBar->AddTool(wxID_NEW, _T("New"), toolBarBitmaps[0], _T("New file"));
     toolBar->AddTool(wxID_OPEN, _T("Open"), toolBarBitmaps[1], _T("Open file"));
 

-    // neither the generic nor Motif native toolbars really support this
-#if (wxUSE_TOOLBAR_NATIVE && !USE_GENERIC_TBAR) && !defined(__WXMOTIF__) && !defined(__WXX11__)
+    // the generic toolbar doesn't really support this
+#if (wxUSE_TOOLBAR_NATIVE && !USE_GENERIC_TBAR) && !defined(__WXX11__) || defined(__WXUNIVERSAL__)

     // adding a combo to a vertical toolbar is not very smart
     if ( m_horzToolbar )
     {
     // adding a combo to a vertical toolbar is not very smart
     if ( m_horzToolbar )
     {

-        wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, "", wxDefaultPosition, wxSize(200,-1) );
-        combo->Append("This");
-        combo->Append("is a");
-        combo->Append("combobox");
-        combo->Append("in a");
-        combo->Append("toolbar");
+        wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, _T(""), wxDefaultPosition, wxSize(200,-1) );
+        combo->Append(_T("This"));
+        combo->Append(_T("is a"));
+        combo->Append(_T("combobox"));
+        combo->Append(_T("in a"));
+        combo->Append(_T("toolbar"));

         toolBar->AddControl(combo);
     }
 #endif // toolbars which don't support controls
         toolBar->AddControl(combo);
     }
 #endif // toolbars which don't support controls


@@ -341,14 +355,17 @@ MyFrame::MyFrame(wxFrame* parent,
        : wxFrame(parent, id, title, pos, size, style)
 {
     m_tbar = NULL;
        : wxFrame(parent, id, title, pos, size, style)
 {
     m_tbar = NULL;

-    m_textWindow = new wxTextCtrl(this, -1, "", wxPoint(0, 0), wxSize(-1, -1), wxTE_MULTILINE);
+    m_textWindow = new wxTextCtrl(this, -1, _T(""), wxPoint(0, 0), wxSize(-1, -1), wxTE_MULTILINE);

 
     m_smallToolbar = TRUE;
     m_horzToolbar = TRUE;
     m_rows = 1;
 
     m_smallToolbar = TRUE;
     m_horzToolbar = TRUE;
     m_rows = 1;

+    m_nPrint = 1;

 
 

+#ifndef __WXWINCE__

     // Give it a status line
     CreateStatusBar();
     // Give it a status line
     CreateStatusBar();

+#endif

 
     // Give it an icon
     SetIcon(wxICON(mondrian));
 
     // Give it an icon
     SetIcon(wxICON(mondrian));


@@ -356,49 +373,49 @@ MyFrame::MyFrame(wxFrame* parent,
     // Make a menubar
     wxMenu *tbarMenu = new wxMenu;
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLE_TOOLBAR,
     // Make a menubar
     wxMenu *tbarMenu = new wxMenu;
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLE_TOOLBAR,

-                              "Toggle &toolbar\tCtrl-Z",
-                              "Show or hide the toolbar");
+                              _T("Toggle &toolbar\tCtrl-Z"),
+                              _T("Show or hide the toolbar"));

 
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR,
 
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR,

-                              "Toggle &another toolbar\tCtrl-A",
-                              "Show/hide another test toolbar");
+                              _T("Toggle &another toolbar\tCtrl-A"),
+                              _T("Show/hide another test toolbar"));

 
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLBARSIZE,
 
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLBARSIZE,

-                              "&Toggle toolbar size\tCtrl-S",
-                              "Toggle between big/small toolbar");
+                              _T("&Toggle toolbar size\tCtrl-S"),
+                              _T("Toggle between big/small toolbar"));

 
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLBARORIENT,
 
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLBARORIENT,

-                              "Toggle toolbar &orientation\tCtrl-O",
-                              "Toggle toolbar orientation");
+                              _T("Toggle toolbar &orientation\tCtrl-O"),
+                              _T("Toggle toolbar orientation"));

 
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLBARROWS,
 
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLBARROWS,

-                              "Toggle number of &rows\tCtrl-R",
-                              "Toggle number of toolbar rows between 1 and 2");
+                              _T("Toggle number of &rows\tCtrl-R"),
+                              _T("Toggle number of toolbar rows between 1 and 2"));

 
     tbarMenu->AppendSeparator();
 
 
     tbarMenu->AppendSeparator();
 

-    tbarMenu->Append(IDM_TOOLBAR_ENABLEPRINT, "&Enable print button\tCtrl-E", "");
-    tbarMenu->Append(IDM_TOOLBAR_DELETEPRINT, "&Delete print button\tCtrl-D", "");
-    tbarMenu->Append(IDM_TOOLBAR_INSERTPRINT, "&Insert print button\tCtrl-I", "");
-    tbarMenu->Append(IDM_TOOLBAR_TOGGLEHELP, "Toggle &help button\tCtrl-T", "");
+    tbarMenu->Append(IDM_TOOLBAR_ENABLEPRINT, _T("&Enable print button\tCtrl-E"), _T(""));
+    tbarMenu->Append(IDM_TOOLBAR_DELETEPRINT, _T("&Delete print button\tCtrl-D"), _T(""));
+    tbarMenu->Append(IDM_TOOLBAR_INSERTPRINT, _T("&Insert print button\tCtrl-I"), _T(""));
+    tbarMenu->Append(IDM_TOOLBAR_TOGGLEHELP, _T("Toggle &help button\tCtrl-T"), _T(""));

     tbarMenu->AppendSeparator();
     tbarMenu->AppendSeparator();

-    tbarMenu->Append(IDM_TOOLBAR_CHANGE_TOOLTIP, "Change tool tip", "");
+    tbarMenu->Append(IDM_TOOLBAR_CHANGE_TOOLTIP, _T("Change tool tip"), _T(""));

     tbarMenu->AppendSeparator();
     tbarMenu->AppendSeparator();

-    tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_TEXT, "Show &text\tAlt-T");
-    tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_ICONS, "Show &icons\tAlt-I");
-    tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_BOTH, "Show &both\tAlt-B");
+    tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_TEXT, _T("Show &text\tAlt-T"));
+    tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_ICONS, _T("Show &icons\tAlt-I"));
+    tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_BOTH, _T("Show &both\tAlt-B"));

 
     wxMenu *fileMenu = new wxMenu;
 
     wxMenu *fileMenu = new wxMenu;

-    fileMenu->Append(wxID_EXIT, "E&xit\tAlt-X", "Quit toolbar sample" );
+    fileMenu->Append(wxID_EXIT, _T("E&xit\tAlt-X"), _T("Quit toolbar sample") );

 
     wxMenu *helpMenu = new wxMenu;
 
     wxMenu *helpMenu = new wxMenu;

-    helpMenu->Append(wxID_HELP, "&About", "About toolbar sample");
+    helpMenu->Append(wxID_HELP, _T("&About"), _T("About toolbar sample"));

 
     wxMenuBar* menuBar = new wxMenuBar( wxMB_DOCKABLE );
 
 
     wxMenuBar* menuBar = new wxMenuBar( wxMB_DOCKABLE );
 

-    menuBar->Append(fileMenu, "&File");
-    menuBar->Append(tbarMenu, "&Toolbar");
-    menuBar->Append(helpMenu, "&Help");
+    menuBar->Append(fileMenu, _T("&File"));
+    menuBar->Append(tbarMenu, _T("&Toolbar"));
+    menuBar->Append(helpMenu, _T("&Help"));

 
     // Associate the menu bar with the frame
     SetMenuBar(menuBar);
 
     // Associate the menu bar with the frame
     SetMenuBar(menuBar);


@@ -487,6 +504,8 @@ void MyFrame::OnToggleAnotherToolbar(wxCommandEvent& WXUNUSED(event))
                                wxDefaultPosition, wxDefaultSize,
                                style);
 
                                wxDefaultPosition, wxDefaultSize,
                                style);
 

+        m_tbar->SetMargins(4, 4);
+

         m_tbar->AddRadioTool(wxID_NEW, _T("First"), wxBITMAP(new));
         m_tbar->AddRadioTool(wxID_OPEN, _T("Second"), wxBITMAP(open));
         m_tbar->AddRadioTool(wxID_SAVE, _T("Third"), wxBITMAP(save));
         m_tbar->AddRadioTool(wxID_NEW, _T("First"), wxBITMAP(new));
         m_tbar->AddRadioTool(wxID_OPEN, _T("Second"), wxBITMAP(open));
         m_tbar->AddRadioTool(wxID_SAVE, _T("Third"), wxBITMAP(save));


@@ -528,9 +547,14 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
     Close(TRUE);
 }
 
     Close(TRUE);
 }
 

-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnAbout(wxCommandEvent& event)

 {
 {

-    (void)wxMessageBox("wxWindows toolbar sample", "About wxToolBar");
+    if ( event.IsChecked() )
+        m_textWindow->WriteText( _T("Help button down now.\n") );
+    else
+        m_textWindow->WriteText( _T("Help button up now.\n") );
+
+    (void)wxMessageBox(_T("wxWindows toolbar sample"), _T("About wxToolBar"));

 }
 
 void MyFrame::OnToolLeftClick(wxCommandEvent& event)
 }
 
 void MyFrame::OnToolLeftClick(wxCommandEvent& event)


@@ -539,14 +563,6 @@ void MyFrame::OnToolLeftClick(wxCommandEvent& event)
     str.Printf( _T("Clicked on tool %d\n"), event.GetId());
     m_textWindow->WriteText( str );
 
     str.Printf( _T("Clicked on tool %d\n"), event.GetId());
     m_textWindow->WriteText( str );
 

-    if (event.GetId() == wxID_HELP)
-    {
-        if ( event.GetExtraLong() != 0 )
-            m_textWindow->WriteText( _T("Help button down now.\n") );
-        else
-            m_textWindow->WriteText( _T("Help button up now.\n") );
-    }
-

     if (event.GetId() == wxID_COPY)
     {
         DoEnablePrint();
     if (event.GetId() == wxID_COPY)
     {
         DoEnablePrint();


@@ -570,18 +586,22 @@ void MyFrame::OnCombo(wxCommandEvent& event)
 
 void MyFrame::DoEnablePrint()
 {
 
 void MyFrame::DoEnablePrint()
 {

+    if ( !m_nPrint )
+        return;
+

     wxToolBarBase *tb = GetToolBar();
     wxToolBarBase *tb = GetToolBar();

-    if (tb->GetToolEnabled(wxID_PRINT))
-        tb->EnableTool( wxID_PRINT, FALSE );
-    else
-        tb->EnableTool( wxID_PRINT, TRUE );
+    tb->EnableTool(wxID_PRINT, !tb->GetToolEnabled(wxID_PRINT));

 }
 
 void MyFrame::DoDeletePrint()
 {
 }
 
 void MyFrame::DoDeletePrint()
 {

-    wxToolBarBase *tb = GetToolBar();
+    if ( !m_nPrint )
+        return;

 
 

+    wxToolBarBase *tb = GetToolBar();

     tb->DeleteTool( wxID_PRINT );
     tb->DeleteTool( wxID_PRINT );

+
+    m_nPrint--;

 }
 
 void MyFrame::DoToggleHelp()
 }
 
 void MyFrame::DoToggleHelp()


@@ -592,7 +612,8 @@ void MyFrame::DoToggleHelp()
 
 void MyFrame::OnUpdateCopyAndCut(wxUpdateUIEvent& event)
 {
 
 void MyFrame::OnUpdateCopyAndCut(wxUpdateUIEvent& event)
 {

-    event.Enable( m_textWindow->CanCopy() );
+    if (m_textWindow)
+        event.Enable( m_textWindow->CanCopy() );

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


@@ -624,14 +645,17 @@ void MyFrame::OnToolbarStyle(wxCommandEvent& event)
 
 void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event))
 {

-    wxBitmap bmp = wxBITMAP(print);
+    m_nPrint++;

 
 

-    GetToolBar()->InsertTool(0, wxID_PRINT, bmp, wxNullBitmap,
-                             FALSE, (wxObject *) NULL,
-                             "Delete this tool",
-                             "This button was inserted into the toolbar");
-
-    GetToolBar()->Realize();
+    wxToolBarBase *tb = GetToolBar();
+    tb->InsertTool(0, wxID_PRINT, _T("New print"),
+                   wxBITMAP(print), wxNullBitmap,
+                   wxITEM_NORMAL,
+                   _T("Delete this tool"),
+                   _T("This button was inserted into the toolbar"));
+
+    // must call Realize() after adding a new button
+    tb->Realize();

 }
 
 void MyFrame::OnToolEnter(wxCommandEvent& event)
 }
 
 void MyFrame::OnToolEnter(wxCommandEvent& event)


@@ -643,6 +667,6 @@ void MyFrame::OnToolEnter(wxCommandEvent& event)
         SetStatusText(str);
     }
     else
         SetStatusText(str);
     }
     else

-        SetStatusText("");
+        SetStatusText(_T(""));

 }
 
 }