wxToolTip

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

diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index 667f84ff47f01fe1e6089a21ef6facf85c772144..7a864d8d4069ee216047e662741ce546d0fa1a49 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


@@ -18,13 +16,14 @@
 
 #include "wx/defs.h"
 #include "wx/control.h"
 
 #include "wx/defs.h"
 #include "wx/control.h"

+#include "wx/bitmap.h"

 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxToolBarTool;
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxToolBarTool;

-class wxToolBarGTK;
+class wxToolBar;

 
 //-----------------------------------------------------------------------------
 // constants
 
 //-----------------------------------------------------------------------------
 // constants


@@ -50,10 +49,11 @@ class wxToolBarTool: public wxObject
   public:
 
     wxToolBarTool(void) {}; 
   public:
 
     wxToolBarTool(void) {}; 

-    wxToolBarTool( wxToolBarGTK *owner, int theIndex = 0, 
+    wxToolBarTool( wxToolBar *owner, int theIndex = 0, 

       const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
       const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,

-      bool toggle = FALSE, wxObject *clientData = NULL, 
-      const wxString& shortHelpString = "", const wxString& longHelpString = "");
+      bool toggle = FALSE, wxObject *clientData = (wxObject *) NULL, 
+      const wxString& shortHelpString = "", const wxString& longHelpString = "",
+      GtkWidget *item = (GtkWidget *) NULL );

    ~wxToolBarTool(void);
 
   public:
    ~wxToolBarTool(void);
 
   public:


@@ -70,24 +70,25 @@ class wxToolBarTool: public wxObject
     bool                  m_isMenuCommand;
     wxString              m_shortHelpString;
     wxString              m_longHelpString;
     bool                  m_isMenuCommand;
     wxString              m_shortHelpString;
     wxString              m_longHelpString;

-    wxToolBarGTK         *m_owner;
+    wxToolBar            *m_owner;
+    GtkWidget            *m_item;

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------

-// wxToolBarGTK
+// wxToolBar

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class wxToolBarGTK: public wxControl
+class wxToolBar: public wxControl

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxToolBarGTK)
+  DECLARE_DYNAMIC_CLASS(wxToolBar)

   
   public:
 
   
   public:
 

-    wxToolBarGTK(void);
-    wxToolBarGTK( wxWindow *parent, wxWindowID id, 
+    wxToolBar(void);
+    wxToolBar( wxWindow *parent, wxWindowID id, 

       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
       long style = 0, const wxString& name = wxToolBarNameStr );
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
       long style = 0, const wxString& name = wxToolBarNameStr );

-   ~wxToolBarGTK(void);
+   ~wxToolBar(void);

 
    bool Create( wxWindow *parent, wxWindowID id, 
      const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
 
    bool Create( wxWindow *parent, wxWindowID id, 
      const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,


@@ -108,14 +109,15 @@ class wxToolBarGTK: 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 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

-    virtual void SetToggle(int toolIndex, bool toggle); // Set this to be togglable (or not)

     virtual wxObject *GetToolClientData(int index) const;
 
     virtual bool GetToolState(int toolIndex) const;
     virtual wxObject *GetToolClientData(int index) const;
 
     virtual bool GetToolState(int toolIndex) const;


@@ -123,15 +125,30 @@ class wxToolBarGTK: 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);

-
-  public:
+    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);
+
+  // 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