X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/798a4529fe37bfd1864b4ed350e7de603bd40f2b..ec8565f3c5d1df72267cb1e3375789090ac091da:/include/wx/motif/frame.h?ds=sidebyside

diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h
index dcc4bd221f..ed717d2a69 100644
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MOTIF_FRAME_H_
 #define _WX_MOTIF_FRAME_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "frame.h"
 #endif
 
@@ -29,10 +29,10 @@ public:
         const wxString& name = wxFrameNameStr)
     {
         Init();
-        
+
         Create(parent, id, title, pos, size, style, name);
     }
-    
+
     bool Create(wxWindow *parent,
         wxWindowID id,
         const wxString& title,
@@ -40,17 +40,17 @@ public:
         const wxSize& size = wxDefaultSize,
         long style = wxDEFAULT_FRAME_STYLE,
         const wxString& name = wxFrameNameStr);
-    
+
     virtual ~wxFrame();
 
-    virtual bool Show(bool show = TRUE);
+    virtual bool Show(bool show = true);
 
     // Set menu bar
     void SetMenuBar(wxMenuBar *menu_bar);
-    
+
     // Set title
     void SetTitle(const wxString& title);
-    
+
     // Set icon
     virtual void SetIcon(const wxIcon& icon);
     virtual void SetIcons(const wxIconBundle& icons);
@@ -58,20 +58,23 @@ public:
 #if wxUSE_STATUSBAR
     virtual void PositionStatusBar();
 #endif // wxUSE_STATUSBAR
-    
+
     // Create toolbar
 #if wxUSE_TOOLBAR
-    virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1, const wxString& name = wxToolBarNameStr);
+    virtual wxToolBar* CreateToolBar(long style = -1,
+                                     wxWindowID id = wxID_ANY,
+                                     const wxString& name = wxToolBarNameStr);
+    virtual void SetToolBar(wxToolBar *toolbar);
     virtual void PositionToolBar();
 #endif // wxUSE_TOOLBAR
-    
+
     // Implementation only from now on
     // -------------------------------
-    
+
     void OnSysColourChanged(wxSysColourChangedEvent& event);
     void OnActivate(wxActivateEvent& event);
-    
-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
+
+    virtual void ChangeFont(bool keepOriginalSize = true);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     WXWidget GetMenuBarWidget() const;
@@ -79,9 +82,9 @@ public:
     WXWidget GetWorkAreaWidget() const { return m_workArea; }
     WXWidget GetClientAreaWidget() const { return m_clientArea; }
     WXWidget GetTopWidget() const { return m_frameShell; }
-    
+
     virtual WXWidget GetMainWidget() const { return m_mainWidget; }
-    
+
     // The widget that can have children on it
     WXWidget GetClientWidget() const;
     bool GetVisibleStatus() const { return m_visibleStatus; }
@@ -89,8 +92,10 @@ public:
 
     bool PreResize();
 
+    void SendSizeEvent();
+
     // for generic/mdig.h
-    virtual void DoGetClientSize(int *width, int *height) const;    
+    virtual void DoGetClientSize(int *width, int *height) const;
 private:
     // common part of all ctors
     void Init();
@@ -104,14 +109,13 @@ private:
     WXWidget              m_clientArea;
     bool                  m_visibleStatus;
     bool                  m_iconized;
-    
+
     virtual void DoGetSize(int *width, int *height) const;
-    virtual void DoGetPosition(int *x, int *y) const;
     virtual void DoSetSize(int x, int y,
         int width, int height,
         int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
-    
+
 private:
     virtual bool DoCreate( wxWindow* parent, wxWindowID id,
                            const wxString& title,