don't try to build shared library on platforms not supporting it

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

diff --git a/include/wx/gtk1/tbargtk.h b/include/wx/gtk1/tbargtk.h
index dc4320d42835904fe9cdcdb22a5c4920d736f33a..c7f755e53097ced57686ba6422c049e0fcee73d0 100644 (file)
--- a/include/wx/gtk1/tbargtk.h
+++ b/include/wx/gtk1/tbargtk.h
@@ -15,7 +15,12 @@
 #endif
 
 #include "wx/defs.h"
+
+#if wxUSE_TOOLBAR
+
 #include "wx/control.h"
+#include "wx/bitmap.h"
+#include "wx/tbarbase.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -35,43 +40,7 @@ class wxToolBar;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char *wxToolBarNameStr;
-
-//-----------------------------------------------------------------------------
-// wxToolBarTool
-//-----------------------------------------------------------------------------
-
-class wxToolBarTool: public wxObject
-{
-  DECLARE_DYNAMIC_CLASS(wxToolBarTool)
-  
-  public:
-
-    wxToolBarTool(void) {}; 
-    wxToolBarTool( wxToolBar *owner, int theIndex = 0, 
-      const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
-      bool toggle = FALSE, wxObject *clientData = (wxObject *) NULL, 
-      const wxString& shortHelpString = "", const wxString& longHelpString = "",
-      GtkWidget *item = (GtkWidget *) NULL );
-   ~wxToolBarTool(void);
-
-  public:
-  
-    int                   m_toolStyle;
-    wxObject             *m_clientData;
-    int                   m_index;
-    bool                  m_toggleState;
-    bool                  m_isToggle;
-    bool                  m_deleteSecondBitmap;
-    bool                  m_enabled;
-    wxBitmap              m_bitmap1;
-    wxBitmap              m_bitmap2;
-    bool                  m_isMenuCommand;
-    wxString              m_shortHelpString;
-    wxString              m_longHelpString;
-    wxToolBar            *m_owner;
-    GtkWidget            *m_item;
-};
+extern const wxChar *wxToolBarNameStr;
 
 //-----------------------------------------------------------------------------
 // wxToolBar
@@ -79,10 +48,7 @@ class wxToolBarTool: public wxObject
 
 class wxToolBar: public wxControl
 {
-  DECLARE_DYNAMIC_CLASS(wxToolBar)
-  
-  public:
-
+public:
     wxToolBar(void);
     wxToolBar( wxWindow *parent, wxWindowID id, 
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
@@ -113,7 +79,7 @@ class wxToolBar: public wxControl
     virtual void AddSeparator(void);
     virtual void ClearTools(void);
     
-    virtual void Realize(void);
+    virtual bool Realize(void);
 
     virtual void EnableTool(int toolIndex, bool enable);
     virtual void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on
@@ -124,17 +90,41 @@ class wxToolBar: public wxControl
 
     virtual void SetMargins(int x, int y);
     void SetMargins(const wxSize& size) { SetMargins(size.x, size.y); };
+    virtual wxSize GetToolMargins(void) { return wxSize(m_xMargin, m_yMargin); }
+    
     virtual void SetToolPacking(int packing);
     virtual void SetToolSeparation(int separation);
+    virtual int GetToolPacking();
+    virtual int GetToolSeparation();
+    
+    virtual wxString GetToolLongHelp(int toolIndex);
+    virtual wxString GetToolShortHelp(int toolIndex);
+    
+    virtual void SetToolLongHelp(int toolIndex, const wxString& helpString);
+    virtual void SetToolShortHelp(int toolIndex, const wxString& helpString);
+    
+    void OnIdle( wxIdleEvent &ievent );
 
   // implementation
   
     GtkToolbar   *m_toolbar;
+    int           m_separation;
     wxList        m_tools;
-    GdkColor      m_fg;
-    GdkColor      m_bg;
+    
+    GdkColor      *m_fg;
+    GdkColor      *m_bg;
+    int           m_xMargin;
+    int           m_yMargin;
+    bool          m_hasToolAlready;
+    
+    void OnInternalIdle();
+    
+private:
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxToolBar)
 };
 
 #endif
-    // __TBARGTKH__
 
+#endif
+    // __TBARGTKH__