VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

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

diff --git a/samples/toolbar/test.cpp b/samples/toolbar/test.cpp
index ee3af9a57dc4d3db0dd302c0327c18daa56dab9a..f6278e43a8b1aa11abfa37c02cba0085d2430da7 100644 (file)
--- a/samples/toolbar/test.cpp
+++ b/samples/toolbar/test.cpp
@@ -85,6 +85,8 @@ public:
     void OnToolLeftClick(wxCommandEvent& event);
     void OnToolEnter(wxCommandEvent& event);
 
+    void OnCombo(wxCommandEvent& event);
+
 private:
     void DoEnablePrint();
     void DoToggleHelp();
@@ -105,7 +107,9 @@ enum
 {
     IDM_TOOLBAR_TOGGLETOOLBAR = 200,
     IDM_TOOLBAR_ENABLEPRINT,
-    IDM_TOOLBAR_TOGGLEHELP
+    IDM_TOOLBAR_TOGGLEHELP,
+
+    ID_COMBO = 1000
 };
 
 // ----------------------------------------------------------------------------
@@ -125,6 +129,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 
     EVT_MENU(-1, MyFrame::OnToolLeftClick)
 
+    EVT_COMBOBOX(ID_COMBO, MyFrame::OnCombo)
+
     EVT_TOOL_ENTER(ID_TOOLBAR, MyFrame::OnToolEnter)
 END_EVENT_TABLE()
 
@@ -205,14 +211,25 @@ bool MyApp::InitToolbar(wxToolBar* toolBar, bool smallicons)
   toolBar->AddTool(wxID_NEW, *(toolBarBitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "New file");
   currentX += width + 5;
   toolBar->AddTool(wxID_OPEN, *(toolBarBitmaps[1]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Open file");
+  currentX += width + 5;
+  toolBar->AddTool(wxID_SAVE, *(toolBarBitmaps[2]), wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Toggle button 1");
+
+  toolBar->AddSeparator();
+
+  wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO);
+  combo->Append("This");
+  combo->Append("is a");
+  combo->Append("combobox");
+  combo->Append("in a");
+  combo->Append("toolbar");
+  toolBar->AddControl(combo);
 
+  toolBar->AddSeparator();
+  
   if ( !smallicons )
   {
       currentX += width + 5;
-      toolBar->AddTool(wxID_SAVE, *(toolBarBitmaps[2]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Save file");
-      currentX += width + 5;
-      toolBar->AddSeparator();
-      toolBar->AddTool(wxID_COPY, *(toolBarBitmaps[3]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Disable/Enable print button");
+      toolBar->AddTool(wxID_COPY, *(toolBarBitmaps[3]), wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Toggle button 2");
       currentX += width + 5;
       toolBar->AddTool(wxID_CUT, *(toolBarBitmaps[4]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Toggle/Untoggle help button");
       currentX += width + 5;
@@ -222,15 +239,13 @@ bool MyApp::InitToolbar(wxToolBar* toolBar, bool smallicons)
       toolBar->AddTool(wxID_PRINT, *(toolBarBitmaps[6]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Print");
       currentX += width + 5;
       toolBar->AddSeparator();
-      toolBar->AddTool(wxID_HELP, *(toolBarBitmaps[7]), *(toolBarBitmaps[6]), TRUE, currentX, -1, (wxObject *) NULL, "Help");
-
-      toolBar->EnableTool( wxID_PRINT, FALSE );
+      toolBar->AddTool(wxID_HELP, *(toolBarBitmaps[7]), wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Help button");
   }
 
   toolBar->Realize();
 
   // Can delete the bitmaps since they're reference counted
-  int i, max = smallicons ? 2 : WXSIZEOF(toolBarBitmaps);
+  int i, max = smallicons ? 3 : WXSIZEOF(toolBarBitmaps);
   for (i = 0; i < max; i++)
     delete toolBarBitmaps[i];
 
@@ -285,7 +300,7 @@ MyFrame::MyFrame(wxFrame* parent,
                                     wxTB_FLAT | wxTB_DOCKABLE,
                                     ID_TOOLBAR);
 
-    tbar->SetMargins( 2, 2 );
+    tbar->SetMargins( 4, 4 );
 
     wxGetApp().InitToolbar(tbar);
 }
@@ -340,6 +355,11 @@ void MyFrame::OnToolLeftClick(wxCommandEvent& event)
     }
 }
 
+void MyFrame::OnCombo(wxCommandEvent& event)
+{
+    wxLogStatus(_T("Combobox string '%s' selected"), event.GetString().c_str());
+}
+
 void MyFrame::DoEnablePrint()
 {
     wxToolBar *tb = GetToolBar();