typo

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

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index 9bdf0109c5eb6c9cfb3064f0c619c6ab06aa455d..508dad108a9425e0f68ccf122ad75625377df3d1 100644 (file)
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -9,16 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_TBAR95_H_
-#define _WX_TBAR95_H_
-
-#ifdef __GNUG__
-    #pragma interface "tbar95.h"
-#endif
+#ifndef _WX_MSW_TBAR95_H_
+#define _WX_MSW_TBAR95_H_

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

+#include "wx/imaglist.h"

 
 class WXDLLEXPORT wxToolBar : public wxToolBarBase
 {
 
 class WXDLLEXPORT wxToolBar : public wxToolBarBase
 {


@@ -60,16 +57,34 @@ public:
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 

+    virtual void SetWindowStyleFlag(long style);
+

     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 
     void OnMouseEvent(wxMouseEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 
     void OnMouseEvent(wxMouseEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);

+    void OnEraseBackground(wxEraseEvent& event);
+
+    void SetFocus() {}
+
+    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;

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

+    // create the native toolbar control
+    bool MSWCreateToolbar(const wxPoint& pos, const wxSize& size);
+
+    // recreate the control completely
+    void Recreate();
+

     // implement base class pure virtuals
     virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
     virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
     // implement base class pure virtuals
     virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
     virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);


@@ -79,23 +94,38 @@ protected:
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
 
     virtual wxToolBarToolBase *CreateTool(int id,
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
 
     virtual wxToolBarToolBase *CreateTool(int id,

-                                          const wxBitmap& bitmap1,
-                                          const wxBitmap& bitmap2,
-                                          bool toggle,
+                                          const wxString& label,
+                                          const wxBitmap& bmpNormal,
+                                          const wxBitmap& bmpDisabled,
+                                          wxItemKind kind,

                                           wxObject *clientData,
                                           wxObject *clientData,

-                                          const wxString& shortHelpString,
-                                          const wxString& longHelpString);
+                                          const wxString& shortHelp,
+                                          const wxString& longHelp);

     virtual wxToolBarToolBase *CreateTool(wxControl *control);
 
     virtual wxToolBarToolBase *CreateTool(wxControl *control);
 

+    // return the appropriate size and flags for the toolbar control
+    virtual wxSize DoGetBestSize() const;
+
+    // handlers for various events
+    bool HandleSize(WXWPARAM wParam, WXLPARAM lParam);
+    bool HandlePaint(WXWPARAM wParam, WXLPARAM lParam);
+    void HandleMouseMove(WXWPARAM wParam, WXLPARAM lParam);
+

     // should be called whenever the toolbar size changes
     void UpdateSize();
 
     // should be called whenever the toolbar size changes
     void UpdateSize();
 

-    // override WndProc to process WM_SIZE
-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    // create m_disabledImgList (but doesn't fill it), set it to NULL if it is
+    // unneeded
+    void CreateDisabledImageList();
+

 
     // 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;
 

+    // the image list with disabled images, may be NULL if we use
+    // system-provided versions of them
+    wxImageList *m_disabledImgList;
+

     // the total number of toolbar elements
     size_t m_nButtons;
 
     // the total number of toolbar elements
     size_t m_nButtons;
 


@@ -105,16 +135,10 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)

-
-    static bool sm_coloursInit; // Have we initialized the colour table yet?
-    static long sm_stdColours[6]; // The RGB values of the standard 6 colours
-
-public:
-    void MapBitmap(WXHBITMAP bitmap, int width, int height);
-
+    DECLARE_NO_COPY_CLASS(wxToolBar)

 };
 
 #endif // wxUSE_TOOLBAR
 
 };
 
 #endif // wxUSE_TOOLBAR
 

-#endif
-    // _WX_TBAR95_H_
+#endif // _WX_MSW_TBAR95_H_
+