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
This commit is contained in:
parent
46675b4610
commit
0ec6fd04eb
@ -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; }
|
||||
|
@ -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);
|
||||
|
@ -29,7 +29,6 @@
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fstream.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#include "wx/textctrl.h"
|
||||
|
@ -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 );
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user