New file use to configure the compilation on VMS-systems

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

diff --git a/samples/toolbar/test.cpp b/samples/toolbar/test.cpp
index 94d4b47df870941f4324f9866d8c544e08a49cfe..03ca8fa7a3feabb19efe93af4e4d096e832ff9c8 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,13 +211,22 @@ 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);
 
   if ( !smallicons )
   {
       currentX += width + 5;
-      toolBar->AddTool(wxID_SAVE, *(toolBarBitmaps[2]), wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Toggle button 1");
-      currentX += width + 5;
-      toolBar->AddSeparator();
       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");
@@ -233,7 +248,7 @@ bool MyApp::InitToolbar(wxToolBar* toolBar, bool smallicons)
   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];
 
@@ -343,6 +358,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();