X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..7a11869dde55ba034e280fd7a764872c8de642cf:/include/wx/msw/tbar95.h

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index 9e6c77877e..2b9e0e2b45 100644
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -5,12 +5,12 @@
 // 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"
@@ -21,12 +21,6 @@
 
 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,25 +31,17 @@ 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, 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)
   {
-    Create(parent, id, pos, size, style, orientation, RowsOrColumns, name);
+    Create(parent, id, pos, size, style, name);
   }
   ~wxToolBar95(void);
 
   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
   void OnPaint(wxPaintEvent& event) { Default() ; }
@@ -72,24 +58,28 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase
                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 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;
 
+  virtual bool GetToolState(int toolIndex) const;
+
   // Add all the buttons: required for Win95.
   virtual bool CreateTools(void);
   virtual void SetRows(int nRows);
   virtual void Layout(void) {}
 
+  // The post-tool-addition call
+  bool Realize() { return CreateTools(); };
+
   // IMPLEMENTATION
   bool MSWCommand(WXUINT param, WXWORD id);
   bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
@@ -105,4 +95,4 @@ DECLARE_EVENT_TABLE()
 
 #endif // USE_TOOL/BUTTONBAR
 #endif
-    // __TBAR95H__
+    // _WX_TBAR95_H_