Regenerated makefiles

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

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index 508dad108a9425e0f68ccf122ad75625377df3d1..92fcfd7bcd76d82b5dee6e113aefcce0fe2515e8 100644 (file)
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -54,6 +54,9 @@ public:
 
     virtual void SetRows(int nRows);
 
 
     virtual void SetRows(int nRows);
 

+    virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap);
+    virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
+

     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 


@@ -75,6 +78,9 @@ public:
 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 

+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }
+

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();


@@ -101,7 +107,9 @@ protected:
                                           wxObject *clientData,
                                           const wxString& shortHelp,
                                           const wxString& longHelp);
                                           wxObject *clientData,
                                           const wxString& shortHelp,
                                           const wxString& longHelp);

-    virtual wxToolBarToolBase *CreateTool(wxControl *control);
+
+    virtual wxToolBarToolBase *CreateTool(wxControl *control,
+                                          const wxString& label);

 
     // return the appropriate size and flags for the toolbar control
     virtual wxSize DoGetBestSize() const;
 
     // return the appropriate size and flags for the toolbar control
     virtual wxSize DoGetBestSize() const;


@@ -118,6 +126,9 @@ protected:
     // unneeded
     void CreateDisabledImageList();
 
     // unneeded
     void CreateDisabledImageList();
 

+    // get the Windows toolbar style of this control
+    long GetMSWToolbarStyle() const;
+

 
     // the big bitmap containing all bitmaps of the toolbar buttons
     WXHBITMAP m_hBitmap;
 
     // the big bitmap containing all bitmaps of the toolbar buttons
     WXHBITMAP m_hBitmap;