X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cc2b747254c8ec8eebba7fb63cd5da5d7166c0db..16193c2b68e0a45d4aa22a923e9ff2b708e4b80c:/include/wx/msw/tbar95.h

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index 17c0d2c5b7..d137c39693 100644
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tbar95.h
+// Name:        wx/msw/tbar95.h
 // Purpose:     wxToolBar95 (Windows 95 toolbar) class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TBAR95_H_
@@ -16,84 +16,100 @@
 #pragma interface "tbar95.h"
 #endif
 
-#if wxUSE_BUTTONBAR && wxUSE_TOOLBAR
-#include "wx/tbarbase.h"
+#if wxUSE_TOOLBAR
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
+#include "wx/tbarbase.h"
 
-class WXDLLEXPORT wxToolBar95: public wxToolBarBase
+class WXDLLEXPORT wxToolBar95 : public wxToolBarBase
 {
-  DECLARE_DYNAMIC_CLASS(wxToolBar95)
- public:
-  /*
-   * Public interface
-   */
+public:
+    wxToolBar95() { Init(); }
 
-  wxToolBar95(void);
+    wxToolBar95(wxWindow *parent,
+                wxWindowID id,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxNO_BORDER | wxTB_HORIZONTAL,
+                const wxString& name = wxToolBarNameStr)
+    {
+        Init();
 
-  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, name);
-  }
-  ~wxToolBar95(void);
+        Create(parent, id, pos, size, style, name);
+    }
 
-  bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            long style = wxNO_BORDER|wxTB_HORIZONTAL,
-            const wxString& name = wxToolBarNameStr);
+    ~wxToolBar95();
 
-  // Call default behaviour
-  void OnPaint(wxPaintEvent& WXUNUSED(event)) { Default() ; }
-  void OnSize(wxSizeEvent& WXUNUSED(event)) { Default() ; }
-  void OnKillFocus(wxFocusEvent& WXUNUSED(event)) { Default() ; }
-  void OnMouseEvent(wxMouseEvent& event);
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxNO_BORDER | wxTB_HORIZONTAL,
+                const wxString& name = wxToolBarNameStr);
 
-  // Handle wxToolBar95 events
+    // override base class virtuals
 
-  // 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(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 = "");
+    virtual 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 = wxEmptyString,
+                                   const wxString& helpString2 = wxEmptyString);
+    virtual bool AddControl(wxControl *control);
 
-  // Set default bitmap 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);
+    virtual void ClearTools();
 
-  // The button size is bigger than the bitmap size
-  wxSize GetToolSize(void) const;
+    virtual bool Realize() { return CreateTools(); };
 
-  wxSize GetMaxSize(void) const;
+    virtual void EnableTool(int toolIndex, bool enable);
+    virtual void ToggleTool(int toolIndex, bool toggle);
 
-  void GetSize(int *w, int *y) const;
+    virtual void SetToolBitmapSize(const wxSize& size);
+    virtual wxSize GetToolSize() const;
+    virtual wxSize GetMaxSize() const;
 
-  virtual bool GetToolState(int toolIndex) 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 LayoutButtons(void) {}
+    virtual bool CreateTools();
+    virtual void SetRows(int nRows);
 
-  // The post-tool-addition call
-  bool Realize() { return CreateTools(); };
+    // IMPLEMENTATION
+    virtual bool MSWCommand(WXUINT param, WXWORD id);
+    virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 
-  // IMPLEMENTATION
-  virtual bool MSWCommand(WXUINT param, WXWORD id);
-  virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result);
-
-  // Responds to colour changes
-  void OnSysColourChanged(wxSysColourChangedEvent& event);
+    void OnMouseEvent(wxMouseEvent& event);
+    void OnSysColourChanged(wxSysColourChangedEvent& event);
 
 protected:
-  WXHBITMAP         m_hBitmap;
+    // common part of all ctors
+    void Init();
+
+    WXHBITMAP m_hBitmap;
 
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
-#endif // wxUSE_TOOL/BUTTONBAR
+class WXDLLEXPORT wxToolBar : public wxToolBar95
+{
+public:
+    wxToolBar() { }
+
+    wxToolBar(wxWindow *parent,
+              wxWindowID id,
+              const wxPoint& pos = wxDefaultPosition,
+              const wxSize& size = wxDefaultSize,
+              long style = wxNO_BORDER | wxTB_HORIZONTAL,
+              const wxString& name = wxToolBarNameStr)
+        : wxToolBar95(parent, id, pos, size, style, name)
+    {
+    }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxToolBar)
+};
+
+#endif // wxUSE_TOOLBAR
+
 #endif
     // _WX_TBAR95_H_