Define WXBUILDING in Xcode projects.

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

diff --git a/include/wx/gtk/toolbar.h b/include/wx/gtk/toolbar.h
index ffefa73a5802a3def5b607586d1e7631536fa213..e099dbb93c5eff55c73cdd8b92521bf08cb8de9c 100644 (file)
--- a/include/wx/gtk/toolbar.h
+++ b/include/wx/gtk/toolbar.h
@@ -12,6 +12,8 @@
 
 #if wxUSE_TOOLBAR
 
 
 #if wxUSE_TOOLBAR
 

+typedef struct _GtkTooltips GtkTooltips;
+

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


@@ -51,15 +53,29 @@ public:
     virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap);
     virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
 
     virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap);
     virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
 

+    virtual bool Realize();
+

     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 

+    virtual wxToolBarToolBase *CreateTool(int id,
+                                          const wxString& label,
+                                          const wxBitmap& bitmap1,
+                                          const wxBitmap& bitmap2 = wxNullBitmap,
+                                          wxItemKind kind = wxITEM_NORMAL,
+                                          wxObject *clientData = NULL,
+                                          const wxString& shortHelpString = wxEmptyString,
+                                          const wxString& longHelpString = wxEmptyString);
+    virtual wxToolBarToolBase *CreateTool(wxControl *control,
+                                          const wxString& label);
+

     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------
 

-    void OnInternalIdle();
-

 protected:
 protected:

+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_DEFAULT; }
+

     virtual wxSize DoGetBestSize() const;
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
     virtual wxSize DoGetBestSize() const;
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 


@@ -71,17 +87,6 @@ protected:
     virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
 
     virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
 

-    virtual wxToolBarToolBase *CreateTool(int id,
-                                          const wxString& label,
-                                          const wxBitmap& bitmap1,
-                                          const wxBitmap& bitmap2,
-                                          wxItemKind kind,
-                                          wxObject *clientData,
-                                          const wxString& shortHelpString,
-                                          const wxString& longHelpString);
-    virtual wxToolBarToolBase *CreateTool(wxControl *control,
-                                          const wxString& label);
-

 private:
     void Init();
     void GtkSetStyle();
 private:
     void Init();
     void GtkSetStyle();