Added wxTolBar::etMargins

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

diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h
index bb719ddac57846cde00f0727b39963b0a20be369..945ecbc5a8c40e2f5ca43b82b97cee257c853f77 100644 (file)
--- 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();
 
@@ -144,12 +161,19 @@ public:
   virtual void CaptureMouse();
   virtual void ReleaseMouse();
 
-  //// Motif-specific
-
+// Implementation
+  virtual void ChangeFont(bool keepOriginalSize = TRUE);
+  virtual void ChangeBackgroundColour();
+  virtual void ChangeForegroundColour();
   WXWidget GetMenuBarWidget() const ;
-  WXWidget GetShellWidget() const { return m_frameShell; }
-  WXWidget GetWorkAreaWidget() const { return m_workArea; }
-  WXWidget GetClientAreaWidget() const { return m_clientArea; }
+  inline WXWidget GetShellWidget() const { return m_frameShell; }
+  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;
   bool GetVisibleStatus() const { return m_visibleStatus; }
 
   bool PreResize();