From: Mattia Barbon Date: Thu, 16 Jan 2003 20:44:47 +0000 (+0000) Subject: Remove calls to a couple of deprecated methods, fix wxMotif build with X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0ec6fd04ebd5f37220cb0d4d7c6d7256af50aee7 Remove calls to a couple of deprecated methods, fix wxMotif build with GCC 3.2, remove deprecated (and unused) fstream.h. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/generic/tabg.h b/include/wx/generic/tabg.h index 0d1bc89a09..047cd38779 100644 --- a/include/wx/generic/tabg.h +++ b/include/wx/generic/tabg.h @@ -103,7 +103,7 @@ public: wxTabView(long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR); ~wxTabView(); - inline int GetNumberOfLayers() const { return m_layers.Number(); } + inline int GetNumberOfLayers() const { return m_layers.GetCount(); } inline wxList& GetLayers() { return m_layers; } inline void SetWindow(wxWindow* wnd) { m_window = wnd; } diff --git a/src/motif/accel.cpp b/src/motif/accel.cpp index 7ce7905121..5ea448aec6 100644 --- a/src/motif/accel.cpp +++ b/src/motif/accel.cpp @@ -99,7 +99,7 @@ bool wxAcceleratorEntry::MatchesEvent(const wxKeyEvent& event) const bool eventAltDown = event.AltDown(); bool eventCtrlDown = event.ControlDown(); bool eventShiftDown = event.ShiftDown(); - int eventKeyCode = event.KeyCode(); + int eventKeyCode = event.GetKeyCode(); bool accAltDown = ((GetFlags() & wxACCEL_ALT) == wxACCEL_ALT); bool accCtrlDown = ((GetFlags() & wxACCEL_CTRL) == wxACCEL_CTRL); diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp index 9dbff0adb2..7bb9799cae 100644 --- a/src/motif/textctrl.cpp +++ b/src/motif/textctrl.cpp @@ -29,7 +29,6 @@ #include #include -#include #include #include "wx/textctrl.h" diff --git a/src/motif/toplevel.cpp b/src/motif/toplevel.cpp index b0180f7a8b..d507efc74b 100644 --- a/src/motif/toplevel.cpp +++ b/src/motif/toplevel.cpp @@ -249,7 +249,7 @@ WXWidget wxTopLevelWindowMotif::GetShellWidget() const } bool wxTopLevelWindowMotif::ShowFullScreen( bool show, - long style = wxFULLSCREEN_ALL ) + long style ) { // TODO, see wxGTK return FALSE; @@ -271,7 +271,7 @@ void wxTopLevelWindowMotif::Restore() NULL ); } -void wxTopLevelWindowMotif::Iconize( bool iconize = TRUE ) +void wxTopLevelWindowMotif::Iconize( bool iconize ) { Widget shell = GetShell( this ); if( !shell ) return; @@ -299,7 +299,7 @@ bool wxTopLevelWindowMotif::IsIconized() const return iconic; } -void wxTopLevelWindowMotif::Maximize( bool maximize = TRUE ) +void wxTopLevelWindowMotif::Maximize( bool maximize ) { Show( TRUE );