wxTreeEvent is declared in one header, not 3 of them

[wxWidgets.git] / include / wx / msw / tbar95.h

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index 404e21f0fc9ff7d897d9ea6bf1c3e1d9a0941316..14e5eb14c528674674a0abd72cd9fbbe4f6eeca9 100644 (file)
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TBAR95_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TBAR95_H_


@@ -16,10 +16,10 @@
 #pragma interface "tbar95.h"
 #endif
 
 #pragma interface "tbar95.h"
 #endif
 

-#if USE_BUTTONBAR && USE_TOOLBAR
+#if wxUSE_TOOLBAR

 #include "wx/tbarbase.h"
 
 #include "wx/tbarbase.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;

 
 class WXDLLEXPORT wxToolBar95: public wxToolBarBase
 {
 
 class WXDLLEXPORT wxToolBar95: public wxToolBarBase
 {


@@ -29,25 +29,22 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase
    * Public interface
    */
 
    * Public interface
    */
 

-  wxToolBar95(void);
+  wxToolBar95();

 
 

-  inline wxToolBar95(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+  wxToolBar95(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,

             long style = wxNO_BORDER|wxTB_HORIZONTAL,
             const wxString& name = wxToolBarNameStr)
   {
     Create(parent, id, pos, size, style, name);
   }
             long style = wxNO_BORDER|wxTB_HORIZONTAL,
             const wxString& name = wxToolBarNameStr)
   {
     Create(parent, id, pos, size, style, name);
   }

-  ~wxToolBar95(void);
+  ~wxToolBar95();

 
   bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
             long style = wxNO_BORDER|wxTB_HORIZONTAL,
             const wxString& name = wxToolBarNameStr);
 
   // Call default behaviour
 
   bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
             long style = wxNO_BORDER|wxTB_HORIZONTAL,
             const wxString& name = wxToolBarNameStr);
 
   // Call default behaviour

-  void OnPaint(wxPaintEvent& event) { Default() ; }
-  void OnSize(wxSizeEvent& event) { Default() ; }
-  void OnMouseEvent(wxMouseEvent& event) { Default() ; }
-  void OnKillFocus(wxFocusEvent& event) { Default() ; }
+  void OnMouseEvent(wxMouseEvent& event);

 
   // Handle wxToolBar95 events
 
 
   // Handle wxToolBar95 events
 


@@ -62,25 +59,26 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase
   void SetToolBitmapSize(const wxSize& size);
   void EnableTool(int toolIndex, bool enable); // additional drawing on enabling
   void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on
   void SetToolBitmapSize(const wxSize& size);
   void EnableTool(int toolIndex, bool enable); // additional drawing on enabling
   void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on

-  void ClearTools(void);
+  void ClearTools();

 
   // The button size is bigger than the bitmap size
 
   // The button size is bigger than the bitmap size

-  wxSize GetToolSize(void) const;
+  wxSize GetToolSize() const;

 
 

-  wxSize GetMaxSize(void) const;
-  void GetSize(int *w, int *y) const;
+  wxSize GetMaxSize() const;
+
+  virtual bool GetToolState(int toolIndex) const;

 
   // Add all the buttons: required for Win95.
 
   // Add all the buttons: required for Win95.

-  virtual bool CreateTools(void);
+  virtual bool CreateTools();

   virtual void SetRows(int nRows);
   virtual void SetRows(int nRows);

-  virtual void Layout(void) {}
+  virtual void LayoutButtons() {}

 
   // The post-tool-addition call
   bool Realize() { return CreateTools(); };
 
   // IMPLEMENTATION
 
   // The post-tool-addition call
   bool Realize() { return CreateTools(); };
 
   // IMPLEMENTATION

-  bool MSWCommand(WXUINT param, WXWORD id);
-  bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
+  virtual bool MSWCommand(WXUINT param, WXWORD id);
+  virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);

 
   // Responds to colour changes
   void OnSysColourChanged(wxSysColourChangedEvent& event);
 
   // Responds to colour changes
   void OnSysColourChanged(wxSysColourChangedEvent& event);


@@ -91,6 +89,7 @@ protected:
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };
 

-#endif // USE_TOOL/BUTTONBAR
+#endif // wxUSE_TOOLBAR
+

 #endif
     // _WX_TBAR95_H_
 #endif
     // _WX_TBAR95_H_