deselect all items when SetSelection(-1) is called (patch 1506943)

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

diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index 340d70d6658d1b0ae596ee09ae389022bf451e14..cc064460cdc62f57abaf072543bc260ec3988357 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();


@@ -64,9 +60,6 @@ public:
 
     GtkToolbar   *m_toolbar;
 
 
     GtkToolbar   *m_toolbar;
 

-    GdkColor     *m_fg;
-    GdkColor     *m_bg;
-

     bool          m_blockEvent;
 
     void OnInternalIdle();
     bool          m_blockEvent;
 
     void OnInternalIdle();