X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfc6fde4b1dd5bfd8ae22839ff9a69cf24eb9120..c0b042fce9be0fab67f229f35ffd117f4e1e0730:/include/wx/motif/frame.h diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h index 9326616bb9..b8f741e825 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,11 +56,14 @@ public: virtual bool Destroy(); - void SetClientSize(int width, int height); 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); } @@ -142,7 +146,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;