Window management and sizer layout corrections

[wxWidgets.git] / include / wx / tbarbase.h

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 7abcc57a46f4120fdc2ba99c2deac41a1c86c3c4..d57869579bc663dc94675c4490b02af4a0fd39b4 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -22,12 +22,15 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

+#if wxUSE_TOOLBAR
+

 #include "wx/bitmap.h"
 #include "wx/list.h"
 #include "wx/control.h"
 
 class WXDLLEXPORT wxToolBarBase;
 class WXDLLEXPORT wxToolBarToolBase;
 #include "wx/bitmap.h"
 #include "wx/list.h"
 #include "wx/control.h"
 
 class WXDLLEXPORT wxToolBarBase;
 class WXDLLEXPORT wxToolBarToolBase;

+class WXDLLEXPORT wxImage;

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -118,9 +121,9 @@ public:
     wxToolBarBase *GetToolBar() const { return m_tbar; }
 
     // style
     wxToolBarBase *GetToolBar() const { return m_tbar; }
 
     // style

-    int IsButton() const { return m_toolStyle == wxTOOL_STYLE_BUTTON; }
-    int IsControl() const { return m_toolStyle == wxTOOL_STYLE_CONTROL; }
-    int IsSeparator() const { return m_toolStyle == wxTOOL_STYLE_SEPARATOR; }
+    bool IsButton() const { return m_toolStyle == wxTOOL_STYLE_BUTTON; }
+    bool IsControl() const { return m_toolStyle == wxTOOL_STYLE_CONTROL; }
+    bool IsSeparator() const { return m_toolStyle == wxTOOL_STYLE_SEPARATOR; }

     int GetStyle() const { return m_toolStyle; }
 
     // state
     int GetStyle() const { return m_toolStyle; }
 
     // state


@@ -236,7 +239,7 @@ public:
     // between the two states.
     wxToolBarToolBase *AddTool(int id,
                                const wxBitmap& bitmap,
     // between the two states.
     wxToolBarToolBase *AddTool(int id,
                                const wxBitmap& bitmap,

-                               const wxBitmap& pushedBitmap = wxNullBitmap,
+                               const wxBitmap& pushedBitmap,

                                bool toggle = FALSE,
                                wxObject *clientData = NULL,
                                const wxString& shortHelpString = wxEmptyString,
                                bool toggle = FALSE,
                                wxObject *clientData = NULL,
                                const wxString& shortHelpString = wxEmptyString,


@@ -335,10 +338,13 @@ public:
     virtual void SetToolSeparation(int separation)
         { m_toolSeparation = separation; }
 
     virtual void SetToolSeparation(int separation)
         { m_toolSeparation = separation; }
 

-    virtual wxSize GetToolMargins() { return wxSize(m_xMargin, m_yMargin); }
+    virtual wxSize GetToolMargins() { return GetMargins(); }

     virtual int GetToolPacking() { return m_toolPacking; }
     virtual int GetToolSeparation() { return m_toolSeparation; }
 
     virtual int GetToolPacking() { return m_toolPacking; }
     virtual int GetToolSeparation() { return m_toolSeparation; }
 

+    // for compatibility
+    wxSize GetMargins() const { return wxSize(m_xMargin, m_yMargin); }
+

     // toolbar geometry
     // ----------------
 
     // toolbar geometry
     // ----------------
 


@@ -407,8 +413,8 @@ public:
     // Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
     virtual void DoToolbarUpdates();
 
     // Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
     virtual void DoToolbarUpdates();
 

-    // Don't want toolbars to accept the focus
-    bool AcceptsFocus() const { return FALSE; }
+    // don't want toolbars to accept the focus
+    virtual bool AcceptsFocus() const { return FALSE; }

 
 protected:
     // to implement in derived classes
 
 protected:
     // to implement in derived classes


@@ -470,6 +476,11 @@ private:
     DECLARE_CLASS(wxToolBarBase)
 };
 
     DECLARE_CLASS(wxToolBarBase)
 };
 

+// Helper function for creating the image for disabled buttons
+bool wxCreateGreyedImage(const wxImage& in, wxImage& out) ;
+
+#endif // wxUSE_TOOLBAR
+

 #endif
     // _WX_TBARBASE_H_
 
 #endif
     // _WX_TBARBASE_H_