Compile fix for the version of VC8 included in the 2003 PSDK.

[wxWidgets.git] / include / wx / gtk / tbargtk.h

diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index 1187c5887fcddc1affce22a3a7e48d09ef4b32ab..28fc7ee00bd8643d94964c45f1c5971de70a0c5d 100644 (file)
--- a/include/wx/gtk/tbargtk.h
+++ b/include/wx/gtk/tbargtk.h
@@ -10,17 +10,13 @@
 #ifndef _WX_GTK_TBARGTK_H_
 #define _WX_GTK_TBARGTK_H_
 
 #ifndef _WX_GTK_TBARGTK_H_
 #define _WX_GTK_TBARGTK_H_
 

-#ifdef __GNUG__
-    #pragma interface "tbargtk.h"
-#endif
-

 #if wxUSE_TOOLBAR
 
 // ----------------------------------------------------------------------------
 // wxToolBar
 // ----------------------------------------------------------------------------
 
 #if wxUSE_TOOLBAR
 
 // ----------------------------------------------------------------------------
 // wxToolBar
 // ----------------------------------------------------------------------------
 

-class wxToolBar : public wxToolBarBase
+class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase

 {
 public:
     // construction/destruction
 {
 public:
     // construction/destruction


@@ -29,7 +25,7 @@ public:
                wxWindowID id,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                wxWindowID id,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,

-               long style = 0,
+               long style = wxTB_HORIZONTAL,

                const wxString& name = wxToolBarNameStr )
     {
         Init();
                const wxString& name = wxToolBarNameStr )
     {
         Init();


@@ -52,15 +48,19 @@ public:
 
     virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
 
 
     virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
 

+    virtual void SetToolShortHelp(int id, const wxString& helpString);
+
+    virtual void SetWindowStyleFlag( long style );
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+    

     // implementation from now on
     // --------------------------
 
     GtkToolbar   *m_toolbar;
 
     // implementation from now on
     // --------------------------
 
     GtkToolbar   *m_toolbar;
 

-    GdkColor     *m_fg;
-    GdkColor     *m_bg;
-
-    bool          m_blockNextEvent;
+    bool          m_blockEvent;

 
     void OnInternalIdle();
 
 
     void OnInternalIdle();
 


@@ -68,6 +68,11 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

+    // set the GTK toolbar style and orientation
+    void GtkSetStyle();
+
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
+    

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


@@ -77,9 +82,10 @@ 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 wxString& label,

                                           const wxBitmap& bitmap1,
                                           const wxBitmap& bitmap2,
                                           const wxBitmap& bitmap1,
                                           const wxBitmap& bitmap2,

-                                          bool toggle,
+                                          wxItemKind kind,

                                           wxObject *clientData,
                                           const wxString& shortHelpString,
                                           const wxString& longHelpString);
                                           wxObject *clientData,
                                           const wxString& shortHelpString,
                                           const wxString& longHelpString);