X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/776d87d504387377f87033b2ade9a2da0b819c17..2b260bc3e2f269de090eefdaefc1450207a7734e:/include/wx/os2/toolbar.h?ds=sidebyside

diff --git a/include/wx/os2/toolbar.h b/include/wx/os2/toolbar.h
index 6fff034fd2..a07398667a 100644
--- a/include/wx/os2/toolbar.h
+++ b/include/wx/os2/toolbar.h
@@ -19,73 +19,101 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
 
 class WXDLLEXPORT wxToolBar: public wxToolBarBase
 {
-  DECLARE_DYNAMIC_CLASS(wxToolBar)
- public:
-  /*
-   * Public interface
-   */
-
-  wxToolBar();
-
-  inline wxToolBar(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);
-  }
-  ~wxToolBar();
-
-  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 OnMouseEvent(wxMouseEvent& event);
-
-  // 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 function hiding suppression
-  inline wxToolBarTool *AddTool(int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
-                                bool toggle = FALSE, wxCoord xPos = -1, wxCoord yPos = -1, wxObject *clientData = NULL,
-                                const wxString& helpString1 = "", const wxString& helpString2 = "")
-  { return(AddTool(toolIndex, bitmap, pushedBitmap, toggle, (long)xPos, (long)yPos, clientData, helpString1, helpString2)); }
-
-  // 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();
-
-  // The button size is bigger than the bitmap size
-  wxSize GetToolSize() const;
-
-  wxSize GetMaxSize() const;
-
-  virtual bool GetToolState(int toolIndex) const;
-
-  // Add all the buttons
-  virtual bool CreateTools();
-  virtual void SetRows(int nRows);
-  virtual void LayoutButtons() {}
-
-  // The post-tool-addition call
-  bool Realize() { return CreateTools(); };
-
-  // IMPLEMENTATION
-  virtual bool OS2Command(WXUINT param, WXWORD id);
-  virtual bool OS2OnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
-
-  // Responds to colour changes
-  void OnSysColourChanged(wxSysColourChangedEvent& event);
+public:
+    /*
+     * Public interface
+     */
+
+    wxToolBar() { Init(); }
+
+    inline wxToolBar( wxWindow*       pParent
+                     ,wxWindowID      vId
+                     ,const wxPoint&  rPos = wxDefaultPosition
+                     ,const wxSize&   rSize = wxDefaultSize
+                     ,long            lStyle = wxNO_BORDER|wxTB_HORIZONTAL
+                     ,const wxString& rName = wxToolBarNameStr
+                    )
+    {
+        Create( pParent
+               ,vId
+               ,rPos
+               ,rSize
+               ,lStyle
+               ,rName
+              );
+    }
+    bool Create( wxWindow*       pParent
+                ,wxWindowID      vId
+                ,const wxPoint&  rPos = wxDefaultPosition
+                ,const wxSize&   rSize = wxDefaultSize
+                ,long            lStyle = wxNO_BORDER|wxTB_HORIZONTAL
+                ,const wxString& rName = wxToolBarNameStr
+               );
+
+    virtual ~wxToolBar();
+
+    // override/implement base class virtuals
+    virtual wxToolBarToolBase* FindToolForPosition( wxCoord x
+                                                   ,wxCoord y
+                                                  ) const;
+
+    // The post-tool-addition call
+    virtual bool Realize(void);
+
+    virtual void SetToolBitmapSize(const wxSize& rSize);
+    virtual wxSize GetToolSize(void) const;
+
+    virtual void SetRows(int nRows);
+
+    // IMPLEMENTATION
+    virtual bool OS2Command( WXUINT uParam
+                            ,WXWORD wId
+                           );
+    virtual bool OS2OnNotify( int       nCtrl
+                             ,WXLPARAM  lParam
+                             ,WXLPARAM* pResult
+                            );
+    void OnMouseEvent(wxMouseEvent& rEvent);
+    void OnSysColourChanged(wxSysColourChangedEvent& rEvent);
 
 protected:
-  WXHBITMAP         m_hBitmap;
-
-DECLARE_EVENT_TABLE()
+    void Init(void);
+    // implement base class pure virtuals
+    virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
+    virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
+
+    virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
+    virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
+    virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
+
+    virtual wxToolBarToolBase* CreateTool( int             vId
+                                          ,const wxBitmap& rBitmap1
+                                          ,const wxBitmap& rBitmap2
+                                          ,bool            bToggle
+                                          ,wxObject*       pClientData
+                                          ,const wxString& rShortHelpString
+                                          ,const wxString& rLongHelpString
+                                         );
+    virtual wxToolBarToolBase* CreateTool(wxControl* pControl);
+
+    // should be called whenever the toolbar size changes
+    void UpdateSize(void);
+
+    // override WndProc to process WM_SIZE
+    virtual MRESULT OS2WindowProc( WXUINT   ulMsg
+                                  ,WXWPARAM wParam
+                                  ,WXLPARAM lParam
+                                 );
+
+    // the big bitmap containing all bitmaps of the toolbar buttons
+    WXHBITMAP                       m_hBitmap;
+
+    // the total number of toolbar elements
+    size_t                          m_nButtons;
+
+private:
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxToolBar)
 };
 
 #endif // wxUSE_TOOLBAR