X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..b59bf2db65896d128d72016c201dc1df9ff6c94e:/include/wx/msw/tbar95.h

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index 5a04b68243..78ef1e5ff8 100644
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -5,28 +5,22 @@
 // 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
 
-#if USE_BUTTONBAR && USE_TOOLBAR
+#if wxUSE_BUTTONBAR && wxUSE_TOOLBAR
 #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
-
 class WXDLLEXPORT wxToolBar95: public wxToolBarBase
 {
   DECLARE_DYNAMIC_CLASS(wxToolBar95)
@@ -37,62 +31,60 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase
 
   wxToolBar95(void);
 
-#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, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            const long style = wxNO_BORDER, const int orientation = wxVERTICAL,
-            const int RowsOrColumns = 1, const wxString& name = wxToolBarNameStr)
+  inline 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);
 
-  bool Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            const long style = wxNO_BORDER, const int orientation = wxVERTICAL,
-            const int RowsOrColumns = 1, const wxString& name = wxToolBarNameStr);
+  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 OnPaint(wxPaintEvent& WXUNUSED(event)) { Default() ; }
+  void OnSize(wxSizeEvent& WXUNUSED(event)) { Default() ; }
+  void OnKillFocus(wxFocusEvent& WXUNUSED(event)) { Default() ; }
+  void OnMouseEvent(wxMouseEvent& event);
 
   // Handle wxToolBar95 events
 
   // If pushedBitmap is NULL, a reversed version of bitmap is
   // created and used as the pushed/toggled image.
   // If toggle is TRUE, the button toggles between the two states.
-  wxToolBarTool *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
-               const bool toggle = FALSE, const long xPos = -1, const long yPos = -1, wxObject *clientData = NULL,
+  wxToolBarTool *AddTool(int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
+               bool toggle = FALSE, long xPos = -1, long yPos = -1, wxObject *clientData = NULL,
                const wxString& helpString1 = "", const wxString& helpString2 = "");
 
-  // New members
   // Set default bitmap size
-  void SetDefaultSize(const wxSize& size);
-  void EnableTool(const int toolIndex, const bool enable); // additional drawing on enabling
-  void ToggleTool(const int toolIndex, const 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);
 
   // The button size is bigger than the bitmap size
-  wxSize GetDefaultButtonSize(void) const;
+  wxSize GetToolSize(void) const;
 
   wxSize GetMaxSize(void) const;
+
   void GetSize(int *w, int *y) const;
+  wxSize GetSize() const { return wxWindow::GetSize(); }
+
+  virtual bool GetToolState(int toolIndex) const;
 
   // Add all the buttons: required for Win95.
   virtual bool CreateTools(void);
-  virtual void SetRows(const int nRows);
+  virtual void SetRows(int nRows);
   virtual void Layout(void) {}
 
+  // The post-tool-addition call
+  bool Realize() { return CreateTools(); };
+
   // IMPLEMENTATION
-  bool MSWCommand(const WXUINT param, const WXWORD id);
-  bool MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam);
+  virtual bool MSWCommand(WXUINT param, WXWORD id);
+  virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result);
 
   // Responds to colour changes
   void OnSysColourChanged(wxSysColourChangedEvent& event);
@@ -103,6 +95,6 @@ protected:
 DECLARE_EVENT_TABLE()
 };
 
-#endif // USE_TOOL/BUTTONBAR
+#endif // wxUSE_TOOL/BUTTONBAR
 #endif
-    // __TBAR95H__
+    // _WX_TBAR95_H_