set listview extended styles after switching to report view and not only when creatin...

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

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index 7b1cd37dccf0d3e3f76f88d7852c5f056f1b6705..92fcfd7bcd76d82b5dee6e113aefcce0fe2515e8 100644 (file)
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -12,10 +12,6 @@
 #ifndef _WX_MSW_TBAR95_H_
 #define _WX_MSW_TBAR95_H_
 
 #ifndef _WX_MSW_TBAR95_H_
 #define _WX_MSW_TBAR95_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "tbar95.h"
-#endif
-

 #if wxUSE_TOOLBAR
 
 #include "wx/dynarray.h"
 #if wxUSE_TOOLBAR
 
 #include "wx/dynarray.h"


@@ -58,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
     // -------------------------------
 


@@ -74,6 +73,14 @@ public:
 
     static WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height);
 
 
     static WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height);
 

+    // override WndProc mainly to process WM_SIZE
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+
+    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();


@@ -100,14 +107,12 @@ protected:
                                           wxObject *clientData,
                                           const wxString& shortHelp,
                                           const wxString& longHelp);
                                           wxObject *clientData,
                                           const wxString& shortHelp,
                                           const wxString& longHelp);

-    virtual wxToolBarToolBase *CreateTool(wxControl *control);

 
 

-    // override WndProc mainly to process WM_SIZE
-    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    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;

-    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;

 
     // handlers for various events
     bool HandleSize(WXWPARAM wParam, WXLPARAM lParam);
 
     // handlers for various events
     bool HandleSize(WXWPARAM wParam, WXLPARAM lParam);


@@ -121,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;