Rotated text patch from Hans-Joachim Baader (with some corrections)

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

diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index a019cefabc2f3858c61f9251f9f8dc86ce44636d..3d7c30d434c9522e34e8bc7ddcec3b1fd3e4d042 100644 (file)
--- a/include/wx/gtk/tbargtk.h
+++ b/include/wx/gtk/tbargtk.h
@@ -15,6 +15,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_TOOLBAR
+

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


@@ -37,7 +40,7 @@ class wxToolBar;
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern const char *wxToolBarNameStr;
+extern const wxChar *wxToolBarNameStr;

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


@@ -45,15 +48,12 @@ extern const char *wxToolBarNameStr;
 
 class wxToolBar: public wxControl
 {
 
 class wxToolBar: public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxToolBar)
-  
-  public:
-
-    wxToolBar(void);
+public:
+    wxToolBar();

     wxToolBar( wxWindow *parent, wxWindowID id, 
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
       long style = 0, const wxString& name = wxToolBarNameStr );
     wxToolBar( wxWindow *parent, wxWindowID id, 
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
       long style = 0, const wxString& name = wxToolBarNameStr );

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

 
    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,


@@ -74,12 +74,23 @@ 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 = (wxObject *)NULL,
+      wxCoord xPos = -1, wxCoord yPos = -1, wxObject *clientData = (wxObject *)NULL,

       const wxString& helpString1 = "", const wxString& helpString2 = "");
       const wxString& helpString1 = "", const wxString& helpString2 = "");

-    virtual void AddSeparator(void);
-    virtual void ClearTools(void);

     
     

-    virtual bool Realize(void);
+    // Add arbitrary control
+    virtual bool AddControl(wxControl *control);
+      
+    // Add space
+    virtual void AddSeparator();
+    
+    // Delete tool by index (=id)
+    virtual bool DeleteTool(int toolIndex);
+
+    // Delete all tools
+    virtual void ClearTools();
+    
+    // Has to be called after adding tools or changing something
+    virtual bool Realize();

 
     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


@@ -102,6 +113,8 @@ class wxToolBar: public wxControl
     
     virtual void SetToolLongHelp(int toolIndex, const wxString& helpString);
     virtual void SetToolShortHelp(int toolIndex, const wxString& helpString);
     
     virtual void SetToolLongHelp(int toolIndex, const wxString& helpString);
     virtual void SetToolShortHelp(int toolIndex, const wxString& helpString);

+    
+    void OnIdle( wxIdleEvent &ievent );

 
   // implementation
   
 
   // implementation
   


@@ -114,8 +127,16 @@ class wxToolBar: public wxControl
     int           m_xMargin;
     int           m_yMargin;
     bool          m_hasToolAlready;
     int           m_xMargin;
     int           m_yMargin;
     bool          m_hasToolAlready;

+    bool          m_blockNextEvent;
+    
+    void OnInternalIdle();
+    
+private:
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxToolBar)

 };
 
 #endif
 };
 
 #endif

-    // __TBARGTKH__

 
 

+#endif
+    // __TBARGTKH__