Fix hiding wxMediaEvent::Clone().

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

diff --git a/include/wx/msw/tbarmsw.h b/include/wx/msw/tbarmsw.h
index ed88e668d20e5288fb405e3a5e43f5fbd78299b7..aa83f500bfa460f792597e7eac2d5866f0453623 100644 (file)
--- a/include/wx/msw/tbarmsw.h
+++ b/include/wx/msw/tbarmsw.h
@@ -1,22 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msw/tbarmsw.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msw/tbarmsw.h

-// Purpose:     wxToolBar for Win16
+// Purpose:     wxToolBar for older Windowses

 // Author:      Julian Smart
 // Modified by: 13.12.99 by VZ during toolbar classes reorganization
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Author:      Julian Smart
 // Modified by: 13.12.99 by VZ during toolbar classes reorganization
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TBARMSW_H_
 #define _WX_TBARMSW_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TBARMSW_H_
 #define _WX_TBARMSW_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "tbarmsw.h"
 #endif
 
 #pragma interface "tbarmsw.h"
 #endif
 

-#if wxUSE_BUTTONBAR && wxUSE_TOOLBAR
+#if wxUSE_TOOLBAR

 
 #include "wx/tbarbase.h"
 
 
 #include "wx/tbarbase.h"
 


@@ -25,7 +25,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxButtonBarNameStr;
 class WXDLLEXPORT wxMemoryDC;
 
 // ----------------------------------------------------------------------------
 class WXDLLEXPORT wxMemoryDC;
 
 // ----------------------------------------------------------------------------

-// wxToolBar for Win16
+// wxToolBar for older Windowses

 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxToolBar : public wxToolBarBase
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxToolBar : public wxToolBarBase


@@ -61,7 +61,7 @@ public:
                                        const wxBitmap& pushedBitmap,
                                        bool toggle,
                                        wxCoord xPos,
                                        const wxBitmap& pushedBitmap,
                                        bool toggle,
                                        wxCoord xPos,

-                                       wxCoord yPos = -1,
+                                       wxCoord yPos = wxDefaultCoord,

                                        wxObject *clientData = NULL,
                                        const wxString& helpString1 = wxEmptyString,
                                        const wxString& helpString2 = wxEmptyString);
                                        wxObject *clientData = NULL,
                                        const wxString& helpString1 = wxEmptyString,
                                        const wxString& helpString2 = wxEmptyString);


@@ -76,7 +76,7 @@ public:
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 

-    // Handle wxWindows events
+    // Handle wxWidgets events

     void OnPaint(wxPaintEvent& event);
     void OnMouseEvent(wxMouseEvent& event);
 
     void OnPaint(wxPaintEvent& event);
     void OnMouseEvent(wxMouseEvent& event);
 


@@ -90,12 +90,13 @@ 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);
 
     void DoRedrawTool(wxToolBarToolBase *tool);
     virtual wxToolBarToolBase *CreateTool(wxControl *control);
 
     void DoRedrawTool(wxToolBarToolBase *tool);


@@ -110,7 +111,7 @@ protected:
     void CreateMask(WXHDC hDC, int xoffset, int yoffset, int dx, int dy);
     void DrawBlankButton(WXHDC hdc, int x, int y, int dx, int dy, int state);
     void DrawButton(WXHDC hdc, int x, int y, int dx, int dy,
     void CreateMask(WXHDC hDC, int xoffset, int yoffset, int dx, int dy);
     void DrawBlankButton(WXHDC hdc, int x, int y, int dx, int dy, int state);
     void DrawButton(WXHDC hdc, int x, int y, int dx, int dy,

-                    wxToolBarTool *tool, int state);
+                    wxToolBarToolBase *tool, int state);

     WXHBITMAP CreateDitherBitmap();
     bool CreateDitherBrush();
     bool FreeDitherBrush();
     WXHBITMAP CreateDitherBitmap();
     bool CreateDitherBrush();
     bool FreeDitherBrush();


@@ -144,7 +145,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };
 
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };
 

-#endif // wxUSE_TOOL/BUTTONBAR
+#endif // wxUSE_TOOLBAR

 
 #endif
     // _WX_TBARMSW_H_
 
 #endif
     // _WX_TBARMSW_H_