wxPython 2.1b1 for wxMSW (wxGTK coming soon)

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

diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index b398eb45203c8aedfad2bb4b8a05ff6fd40cc558..5a6f17415dcdcec6781685ab80b6e1e6affbdc17 100644 (file)
--- a/include/wx/gtk/tbargtk.h
+++ b/include/wx/gtk/tbargtk.h
@@ -2,8 +2,6 @@
 // Name:        tbargtk.h
 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
 // Name:        tbargtk.h
 // Purpose:     GTK toolbar
 // Author:      Robert Roebling

-// Modified by:
-// Created:     01/02/97

 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Licence:    wxWindows licence
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Licence:    wxWindows licence


@@ -17,7 +15,12 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_TOOLBAR
+

 #include "wx/control.h"
 #include "wx/control.h"

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

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -37,41 +40,7 @@ class wxToolBar;
 // global data
 //-----------------------------------------------------------------------------
 
 // 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 = NULL, 
-      const wxString& shortHelpString = "", const wxString& longHelpString = "");
-   ~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;
-};
+extern const wxChar *wxToolBarNameStr;

 
 //-----------------------------------------------------------------------------
 // wxToolBar
 
 //-----------------------------------------------------------------------------
 // wxToolBar


@@ -79,6 +48,7 @@ class wxToolBarTool: public wxObject
 
 class wxToolBar: public wxControl
 {
 
 class wxToolBar: public wxControl
 {

+  DECLARE_EVENT_TABLE()

   DECLARE_DYNAMIC_CLASS(wxToolBar)
   
   public:
   DECLARE_DYNAMIC_CLASS(wxToolBar)
   
   public:


@@ -108,12 +78,12 @@ class wxToolBar: public wxControl
     // If toggle is TRUE, the button toggles between the two states.
     virtual wxToolBarTool *AddTool( int toolIndex, const wxBitmap& bitmap, 
       const wxBitmap& pushedBitmap = wxNullBitmap, bool toggle = FALSE,
     // If toggle is TRUE, the button toggles between the two states.
     virtual wxToolBarTool *AddTool( int toolIndex, const wxBitmap& bitmap, 
       const wxBitmap& pushedBitmap = wxNullBitmap, bool toggle = FALSE,

-      float xPos = -1, float yPos = -1, wxObject *clientData = NULL,
+      float xPos = -1, float yPos = -1, wxObject *clientData = (wxObject *)NULL,

       const wxString& helpString1 = "", const wxString& helpString2 = "");
     virtual void AddSeparator(void);
     virtual void ClearTools(void);
     
       const wxString& helpString1 = "", const wxString& helpString2 = "");
     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
 
     virtual void EnableTool(int toolIndex, bool enable);
     virtual void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on


@@ -124,17 +94,35 @@ class wxToolBar: public wxControl
 
     virtual void SetMargins(int x, int y);
     void SetMargins(const wxSize& size) { SetMargins(size.x, size.y); };
 
     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 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 );

 
 

-  public:
+  // implementation

   
     GtkToolbar   *m_toolbar;
   
     GtkToolbar   *m_toolbar;

+    int           m_separation;

     wxList        m_tools;
     wxList        m_tools;

-  
-  DECLARE_EVENT_TABLE()
+    
+    GdkColor      *m_fg;
+    GdkColor      *m_bg;
+    int           m_xMargin;
+    int           m_yMargin;
+    bool          m_hasToolAlready;

 };
 
 #endif
 };
 
 #endif

-    // __TBARGTKH__

 
 

+#endif
+    // __TBARGTKH__