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 0d1bc89a0905ef57397eba80591307970942320a..047cd387790788016b4bff703a4cd55df1ec4004 100644 (file)
--- 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();
 
   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; }
   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 7ce79051218c2c30f2656aa9896d8845185832f9..5ea448aec6eb1551d4e7014778c3c7bda3a3fa22 100644 (file)
--- 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();
     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);
 
     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 9dbff0adb2b6b1c235a92998461af102a1f030d0..7bb9799cae4a5f6d2e0cd2656115631bb65ae002 100644 (file)
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -29,7 +29,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>

-#include <fstream.h>

 #include <ctype.h>
 
 #include "wx/textctrl.h"
 #include <ctype.h>
 
 #include "wx/textctrl.h"

diff --git a/src/motif/toplevel.cpp b/src/motif/toplevel.cpp
index b0180f7a8bd23c1392c7bb939034eaf987cdf01c..d507efc74b4fb624dc4661df1a348e8320739fd8 100644 (file)
--- a/src/motif/toplevel.cpp
+++ b/src/motif/toplevel.cpp
@@ -249,7 +249,7 @@ WXWidget wxTopLevelWindowMotif::GetShellWidget() const
 }
 
 bool wxTopLevelWindowMotif::ShowFullScreen( bool show,
 }
 
 bool wxTopLevelWindowMotif::ShowFullScreen( bool show,

-                                            long style = wxFULLSCREEN_ALL )
+                                            long style )

 {
     // TODO, see wxGTK
     return FALSE;
 {
     // TODO, see wxGTK
     return FALSE;


@@ -271,7 +271,7 @@ void wxTopLevelWindowMotif::Restore()
                        NULL );
 }
 
                        NULL );
 }
 

-void wxTopLevelWindowMotif::Iconize( bool iconize = TRUE )
+void wxTopLevelWindowMotif::Iconize( bool iconize )

 {
     Widget shell = GetShell( this );
     if( !shell ) return;
 {
     Widget shell = GetShell( this );
     if( !shell ) return;


@@ -299,7 +299,7 @@ bool wxTopLevelWindowMotif::IsIconized() const
     return iconic;
 }
 
     return iconic;
 }
 

-void wxTopLevelWindowMotif::Maximize( bool maximize = TRUE )
+void wxTopLevelWindowMotif::Maximize( bool maximize )

 {
     Show( TRUE );
 
 {
     Show( TRUE );