X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b5f3fe655deeb91d5d3abe8fad30c4a1cae63dc..816e2c288c5b349289d0962e8e4ff26478ebbd96:/include/wx/motif/frame.h

diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h
index c92ac4ba78..91b6567d8e 100644
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -54,12 +54,29 @@ public:
            const wxString& name = wxFrameNameStr);
 
   virtual bool Destroy();
+
   void SetClientSize(int width, int height);
+  void SetClientSize(const wxSize& size) { wxWindow::SetClientSize(size); }
+
   void GetClientSize(int *width, int *height) const;
+  wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
 
   void GetSize(int *width, int *height) const ;
+  wxSize GetSize() const { return wxWindow::GetSize(); }
+
   void GetPosition(int *x, int *y) const ;
+  wxPoint GetPosition() const { return wxWindow::GetPosition(); }
+
   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+  virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
+    { wxWindow::SetSize(rect, sizeFlags); }
+  virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
+
+  void ClientToScreen(int *x, int *y) const;
+  wxPoint ClientToScreen(const wxPoint& pt) const { return wxWindow::ClientToScreen(pt); }
+
+  void ScreenToClient(int *x, int *y) const;
+  wxPoint ScreenToClient(const wxPoint& pt) const { return wxWindow::ScreenToClient(pt); }
 
   virtual bool OnClose();
 
@@ -97,12 +114,14 @@ public:
     const wxString& name);
 
   // Create toolbar
+#if wxUSE_TOOLBAR
   virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1, const wxString& name = wxToolBarNameStr);
   virtual wxToolBar *OnCreateToolBar(long style, wxWindowID id, const wxString& name);
   // If made known to the frame, the frame will manage it automatically.
   virtual void SetToolBar(wxToolBar *toolbar) ;
   virtual wxToolBar *GetToolBar() const ;
   virtual void PositionToolBar();
+#endif // wxUSE_TOOLBAR
 
   // Set status line text
   virtual void SetStatusText(const wxString& text, int number = 0);
@@ -126,6 +145,10 @@ public:
   // Compatibility
   inline bool Iconized() const { return IsIconized(); }
 
+  // Is the frame maximized? Returns FALSE under Motif (but TRUE for
+  // wxMDIChildFrame due to the tabbed implementation).
+  virtual bool IsMaximized(void) const ;
+
   virtual void Maximize(bool maximize);
 
   // Responds to colour changes
@@ -153,6 +176,7 @@ public:
   inline WXWidget GetWorkAreaWidget() const { return m_workArea; }
   inline WXWidget GetClientAreaWidget() const { return m_clientArea; }
   inline WXWidget GetTopWidget() const { return m_frameShell; }
+  inline WXWidget GetMainWindowWidget() const { return m_frameWidget; }
 
   // The widget that can have children on it
   WXWidget GetClientWidget() const;
@@ -166,7 +190,10 @@ protected:
   wxIcon                m_icon;
   bool                  m_iconized;
   static bool           m_useNativeStatusBar;
+
+#if wxUSE_TOOLBAR
   wxToolBar *           m_frameToolBar ;
+#endif // wxUSE_TOOLBAR
 
   //// Motif-specific