added WX_ASSERT_MESSAGE macro to simply using CPPUNIT_ASSERT_MESSAGE with wxString...

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

diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index 340d70d6658d1b0ae596ee09ae389022bf451e14..279f5e924ea4729bc44394f198ac11e53c9af5ee 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_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #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();


@@ -56,17 +52,17 @@ public:
 
     virtual void SetWindowStyleFlag( long style );
 
 
     virtual void SetWindowStyleFlag( long style );
 

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

     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
     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_blockEvent;
 
     void OnInternalIdle();
     bool          m_blockEvent;
 
     void OnInternalIdle();


@@ -78,6 +74,8 @@ protected:
     // set the GTK toolbar style and orientation
     void GtkSetStyle();
 
     // 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);


@@ -94,7 +92,8 @@ protected:
                                           wxObject *clientData,
                                           const wxString& shortHelpString,
                                           const wxString& longHelpString);
                                           wxObject *clientData,
                                           const wxString& shortHelpString,
                                           const wxString& longHelpString);

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

 
 private:
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxToolBar)