Initial import of wxWebKitCtrl sources and htmlctrl (right now wxWebKit) sample.

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

diff --git a/include/wx/motif/toolbar.h b/include/wx/motif/toolbar.h
index fdb2e95681ef1a72023d1454d783a467b706603d..6bb1e36d64387b36d3dfdbf68fc388beb5254983 100644 (file)
--- a/include/wx/motif/toolbar.h
+++ b/include/wx/motif/toolbar.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TOOLBAR_H_
 #define _WX_TOOLBAR_H_
 
 #ifndef _WX_TOOLBAR_H_
 #define _WX_TOOLBAR_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "toolbar.h"
 #endif
 
 #pragma interface "toolbar.h"
 #endif
 


@@ -53,7 +53,7 @@ public:
     // find tool by widget
     wxToolBarToolBase *FindToolByWidget(WXWidget w) const;
     
     // find tool by widget
     wxToolBarToolBase *FindToolByWidget(WXWidget w) const;
     

-protected:
+private:

     // common part of all ctors
     void Init();
     
     // common part of all ctors
     void Init();
     


@@ -74,7 +74,10 @@ protected:
                                           const wxString& shortHelp,
                                           const wxString& longHelp);
     virtual wxToolBarToolBase *CreateTool(wxControl *control);
                                           const wxString& shortHelp,
                                           const wxString& longHelp);
     virtual wxToolBarToolBase *CreateTool(wxControl *control);

-    
+
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);

 private:
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };