diff --git a/include/wx/frame.h b/include/wx/frame.h index 1693a256ef..8b0d2184a8 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -169,17 +169,6 @@ public: // Implement internal behaviour (menu updating on some platforms) virtual void OnInternalIdle(); - // if there is no real wxTopLevelWindow on this platform we have to define - // some wxTopLevelWindowBase pure virtual functions here to avoid breaking - // old ports (wxMotif) which don't define them in wxFrame -#ifndef wxTopLevelWindowNative - virtual bool ShowFullScreen(bool WXUNUSED(show), - long WXUNUSED(style) = wxFULLSCREEN_ALL) - { return false; } - virtual bool IsFullScreen() const - { return false; } -#endif // no wxTopLevelWindowNative - #if wxUSE_MENUS || wxUSE_TOOLBAR // show help text for the currently selected menu or toolbar item // (typically in the status bar) or hide it and restore the status bar text diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index c5cbf1e220..8d6b5eef26 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -344,28 +344,25 @@ protected: #ifdef __WXUNIVERSAL__ #include "wx/univ/toplevel.h" #else // !__WXUNIVERSAL__ - #ifdef wxTopLevelWindowNative - class WXDLLIMPEXP_CORE wxTopLevelWindow : public wxTopLevelWindowNative + class WXDLLIMPEXP_CORE wxTopLevelWindow : public wxTopLevelWindowNative + { + public: + // construction + wxTopLevelWindow() { } + wxTopLevelWindow(wxWindow *parent, + wxWindowID winid, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE, + const wxString& name = wxFrameNameStr) + : wxTopLevelWindowNative(parent, winid, title, + pos, size, style, name) { - public: - // construction - wxTopLevelWindow() { } - wxTopLevelWindow(wxWindow *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - : wxTopLevelWindowNative(parent, winid, title, - pos, size, style, name) - { - } + } - DECLARE_DYNAMIC_CLASS_NO_COPY(wxTopLevelWindow) - }; - #endif // wxTopLevelWindowNative + DECLARE_DYNAMIC_CLASS_NO_COPY(wxTopLevelWindow) + }; #endif // __WXUNIVERSAL__/!__WXUNIVERSAL__ - #endif // _WX_TOPLEVEL_BASE_H_