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 9e6c77877ebe23c6f15533bc0c20fc0bb5334d71..14e5eb14c528674674a0abd72cd9fbbe4f6eeca9 100644 (file)
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -5,27 +5,21 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __TBAR95H__
-#define __TBAR95H__
+#ifndef _WX_TBAR95_H_
+#define _WX_TBAR95_H_

 
 #ifdef __GNUG__
 #pragma interface "tbar95.h"
 #endif
 
 
 #ifdef __GNUG__
 #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;
-
-#define DEFAULTBITMAPX   16
-#define DEFAULTBITMAPY   15
-#define DEFAULTBUTTONX   24
-#define DEFAULTBUTTONY   24
-#define DEFAULTBARHEIGHT 27
+WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;

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


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

-  wxToolBar95(void);
+  wxToolBar95();

 
 

-#if WXWIN_COMPATIBILITY > 0
-  inline wxToolBar95(wxWindow *parent, int x, int y, int w, int h,
-            long style = wxNO_BORDER, int orientation = wxVERTICAL, int RowsOrColumns = 2,
-            const char *name = wxToolBarNameStr)
-  {
-    Create(parent, -1, wxPoint(x, y), wxSize(w, h), style, orientation, RowsOrColumns, name);
-  }
-#endif
-  inline wxToolBar95(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            long style = wxNO_BORDER, int orientation = wxVERTICAL,
-            int RowsOrColumns = 1, const wxString& name = wxToolBarNameStr)
+  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, orientation, RowsOrColumns, name);
+    Create(parent, id, pos, size, style, name);

   }
   }

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

 
   bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
 
   bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,

-            long style = wxNO_BORDER, int orientation = wxVERTICAL,
-            int RowsOrColumns = 1, const wxString& name = wxToolBarNameStr);
+            long style = wxNO_BORDER|wxTB_HORIZONTAL,
+            const wxString& name = wxToolBarNameStr);

 
   // Call default behaviour
 
   // 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
 


@@ -72,27 +55,30 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase
                bool toggle = FALSE, long xPos = -1, long yPos = -1, wxObject *clientData = NULL,
                const wxString& helpString1 = "", const wxString& helpString2 = "");
 
                bool toggle = FALSE, long xPos = -1, long yPos = -1, wxObject *clientData = NULL,
                const wxString& helpString1 = "", const wxString& helpString2 = "");
 

-  // New members

   // Set default bitmap size
   // Set default bitmap size

-  void SetDefaultSize(const wxSize& size);
+  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 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 GetDefaultButtonSize(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
 
   // 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);


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

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

 #endif
 #endif

-    // __TBAR95H__
+    // _WX_TBAR95_H_