X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/721b32e05823b7b7356f9a7a99f7d0af457dc5f3..e90196a556e288234cacf7e5166f3f4a6d971175:/include/wx/motif/frame.h

diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h
index 4c9372f4d9..11e67cb620 100644
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FRAME_H_
@@ -19,6 +19,7 @@
 #include "wx/window.h"
 #include "wx/toolbar.h"
 #include "wx/accel.h"
+#include "wx/icon.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
 WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
@@ -55,14 +56,6 @@ public:
 
     virtual bool Destroy();
 
-    void GetClientSize(int *width, int *height) const;
-    void GetSize(int *width, int *height) const ;
-    void GetPosition(int *x, int *y) const ;
-
-    wxSize GetSize() const { return wxWindow::GetSize(); }
-    wxPoint GetPosition() const { return wxWindow::GetPosition(); }
-    wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
-
     void ClientToScreen(int *x, int *y) const;
     wxPoint ClientToScreen(const wxPoint& pt) const { return wxWindow::ClientToScreen(pt); }
 
@@ -145,7 +138,7 @@ public:
 
     // Query app for menu item updates (called from OnIdle)
     void DoMenuUpdates();
-    void DoMenuUpdates(wxMenu* menu);
+    void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
 
     // Checks if there is a toolbar, and returns the first free client position
     virtual wxPoint GetClientAreaOrigin() const;
@@ -173,6 +166,11 @@ public:
 
     bool PreResize();
 
+protected:
+    void DoGetClientSize(int *width, int *height) const;
+    void DoGetSize(int *width, int *height) const ;
+    void DoGetPosition(int *x, int *y) const ;
+
 protected:
     wxMenuBar *           m_frameMenuBar;
     wxStatusBar *         m_frameStatusBar;