Attempting to check in this wretched cursor again. Also added SetAcceleratorTable

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

diff --git a/samples/toolbar/test.h b/samples/toolbar/test.h
index 1c680a819d5819de9893333d77a45b8cbe11140d..4f2a12bb79116d1df4f692d5334b3cb3b603c228 100644 (file)
--- a/samples/toolbar/test.h
+++ b/samples/toolbar/test.h
@@ -14,6 +14,7 @@ class MyApp: public wxApp
 {
   public:
     bool OnInit(void);
 {
   public:
     bool OnInit(void);

+    bool InitToolbar(wxToolBar* toolBar);

 };
 
 // Define a new frame
 };
 
 // Define a new frame


@@ -25,9 +26,10 @@ public:
         long style = wxDEFAULT_FRAME_STYLE);
 
     void OnCloseWindow(wxCloseEvent& event);
         long style = wxDEFAULT_FRAME_STYLE);
 
     void OnCloseWindow(wxCloseEvent& event);

-    void OnMenuHighlight(wxMenuEvent& event);

     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);

+    void OnToolLeftClick(wxCommandEvent& event);
+    void OnToolEnter(wxCommandEvent& event);

 
 private:
     wxTextCtrl*         m_textWindow;
 
 private:
     wxTextCtrl*         m_textWindow;


@@ -35,19 +37,5 @@ private:
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };
 

-class TestToolBar: public wxToolBar
-{
-  public:
-  TestToolBar(wxFrame *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = wxNO_BORDER, int direction = wxVERTICAL, int RowsOrColumns = 2);
-  bool OnLeftClick(int toolIndex, bool toggled);
-  void OnMouseEnter(int toolIndex);
-  void OnPaint(wxPaintEvent& event);
-  
-  DECLARE_EVENT_TABLE()
-};
-
-#define TEST_QUIT                100
-#define TEST_ABOUT               101
+#define ID_TOOLBAR  500