rearranging contentview, adding toolbar

[wxWidgets.git] / include / wx / msw / toolbar.h

diff --git a/include/wx/msw/toolbar.h b/include/wx/msw/toolbar.h
index b835541e802713268708da73f754b3cfc27d05bc..4de16f718040e50708271994408423a5ba21206f 100644 (file)
--- a/include/wx/msw/toolbar.h
+++ b/include/wx/msw/toolbar.h
@@ -142,6 +142,10 @@ protected:
     // the total number of toolbar elements
     size_t m_nButtons;
 
     // the total number of toolbar elements
     size_t m_nButtons;
 

+    // the sum of the sizes of the fixed items (i.e. excluding stretchable
+    // spaces) in the toolbar direction
+    int m_totalFixedSize;
+

     // the tool the cursor is in
     wxToolBarToolBase *m_pInTool;
 
     // the tool the cursor is in
     wxToolBarToolBase *m_pInTool;
 


@@ -149,6 +153,17 @@ private:
     // makes sure tool bitmap size is sufficient for all tools
     void AdjustToolBitmapSize();
 
     // makes sure tool bitmap size is sufficient for all tools
     void AdjustToolBitmapSize();
 

+    // update the sizes of stretchable spacers to consume all extra space we
+    // have
+    void UpdateStretchableSpacersSize();
+
+    // redraw the background of the given part of the window (or entire window
+    // if the parameter is NULL) to erase separator drawn in it
+    //
+    // return true if the background was erased using DrawThemeBackground()
+    bool MSWEraseRect(wxDC& dc, const wxRect *rectItem = NULL);
+
+

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)
     wxDECLARE_NO_COPY_CLASS(wxToolBar);
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)
     wxDECLARE_NO_COPY_CLASS(wxToolBar);