Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move unused values into 2.4 compatibility. Source cleaning.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-12-15 12:22:51 +00:00
parent f2ba382267
commit e951b8e4e6
3 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/window.h
View File

@@ -32,12 +32,14 @@
// constants // constants
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// FIXME does anybody use those? they're unused by wxWidgets... #if WXWIN_COMPATIBILITY_2_4
// they're unused by wxWidgets...
enum enum
{ {
wxKEY_SHIFT = 1, wxKEY_SHIFT = 1,
wxKEY_CTRL = 2 wxKEY_CTRL = 2
}; };
#endif
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// wxWindow declaration for MSW // wxWindow declaration for MSW

32
include/wx/os2/window.h
View File

@@ -40,12 +40,14 @@ class WXDLLEXPORT wxButton;
// constants // constants
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// FIXME does anybody use those? they're unused by wxWidgets... #if WXWIN_COMPATIBILITY_2_4
// they're unused by wxWidgets...
enum enum
{ {
wxKEY_SHIFT = 1, wxKEY_SHIFT = 1,
wxKEY_CTRL = 2 wxKEY_CTRL = 2
}; };
#endif
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// wxWindow declaration for OS/2 PM // wxWindow declaration for OS/2 PM
@@ -92,15 +94,15 @@ public:
virtual wxString GetTitle(void) const; virtual wxString GetTitle(void) const;
virtual void Raise(void); virtual void Raise(void);
virtual void Lower(void); virtual void Lower(void);
virtual bool Show(bool bShow = TRUE); virtual bool Show(bool bShow = true);
virtual bool Enable(bool bEnable = TRUE); virtual bool Enable(bool bEnable = true);
virtual void SetFocus(void); virtual void SetFocus(void);
virtual void SetFocusFromKbd(void); virtual void SetFocusFromKbd(void);
virtual bool Reparent(wxWindow* pNewParent); virtual bool Reparent(wxWindow* pNewParent);
virtual void WarpPointer( int x virtual void WarpPointer( int x
,int y ,int y
); );
virtual void Refresh( bool bEraseBackground = TRUE virtual void Refresh( bool bEraseBackground = true
,const wxRect* pRect = (const wxRect *)NULL ,const wxRect* pRect = (const wxRect *)NULL
); );
virtual void Freeze(void); virtual void Freeze(void);
@@ -129,11 +131,11 @@ public:
,int nPos ,int nPos
,int nThumbVisible ,int nThumbVisible
,int nRange ,int nRange
,bool bRefresh = TRUE ,bool bRefresh = true
); );
virtual void SetScrollPos( int nOrient virtual void SetScrollPos( int nOrient
,int nPos ,int nPos
,bool bRefresh = TRUE ,bool bRefresh = true
); );
virtual int GetScrollPos(int nOrient) const; virtual int GetScrollPos(int nOrient) const;
virtual int GetScrollThumb(int nOrient) const; virtual int GetScrollThumb(int nOrient) const;
@@ -176,7 +178,7 @@ public:
virtual WXWidget GetHandle(void) const { return GetHWND(); } virtual WXWidget GetHandle(void) const { return GetHWND(); }
bool GetUseCtl3D(void) const { return m_bUseCtl3D; } bool GetUseCtl3D(void) const { return m_bUseCtl3D; }
bool GetTransparentBackground(void) const { return m_bBackgroundTransparent; } bool GetTransparentBackground(void) const { return m_bBackgroundTransparent; }
void SetTransparent(bool bT = TRUE) { m_bBackgroundTransparent = bT; } void SetTransparent(bool bT = true) { m_bBackgroundTransparent = bT; }
// event handlers // event handlers
// -------------- // --------------
@@ -197,22 +199,22 @@ public:
WXFARPROC OS2GetOldWndProc(void) const { return m_fnOldWndProc; } WXFARPROC OS2GetOldWndProc(void) const { return m_fnOldWndProc; }
void OS2SetOldWndProc(WXFARPROC fnProc) { m_fnOldWndProc = fnProc; } void OS2SetOldWndProc(WXFARPROC fnProc) { m_fnOldWndProc = fnProc; }
// //
// Return TRUE if the window is of a standard (i.e. not wxWidgets') class // Return true if the window is of a standard (i.e. not wxWidgets') class
// //
bool IsOfStandardClass(void) const { return m_fnOldWndProc != NULL; } bool IsOfStandardClass(void) const { return m_fnOldWndProc != NULL; }
wxWindow* FindItem(long lId) const; wxWindow* FindItem(long lId) const;
wxWindow* FindItemByHWND( WXHWND hWnd wxWindow* FindItemByHWND( WXHWND hWnd
,bool bControlOnly = FALSE ,bool bControlOnly = false
) const; ) const;
// Make a Windows extended style from the given wxWidgets window style ?? applicable to OS/2?? // Make a Windows extended style from the given wxWidgets window style ?? applicable to OS/2??
static WXDWORD MakeExtendedStyle( long lStyle static WXDWORD MakeExtendedStyle( long lStyle
,bool bEliminateBorders = TRUE ,bool bEliminateBorders = true
); );
// PM only: TRUE if this control is part of the main control // PM only: true if this control is part of the main control
virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return FALSE; }; virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; };
// translate wxWidgets style flags for this control into the PM style // translate wxWidgets style flags for this control into the PM style
// and optional extended style for the corresponding native control // and optional extended style for the corresponding native control
@@ -234,7 +236,7 @@ public:
// get the HWND to be used as parent of this window with CreateWindow() // get the HWND to be used as parent of this window with CreateWindow()
virtual WXHWND OS2GetParent(void) const; virtual WXHWND OS2GetParent(void) const;
// returns TRUE if the window has been created // returns true if the window has been created
bool OS2Create( PSZ zClass bool OS2Create( PSZ zClass
,const char* zTitle ,const char* zTitle
,WXDWORD dwStyle ,WXDWORD dwStyle
@@ -293,7 +295,7 @@ public:
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// internal handlers for OS2 messages: all handlers return a boolen value: // internal handlers for OS2 messages: all handlers return a boolen value:
// TRUE means that the handler processed the event and FALSE that it didn't // true means that the handler processed the event and false that it didn't
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// there are several cases where we have virtual functions for PM // there are several cases where we have virtual functions for PM
@@ -369,7 +371,7 @@ public:
); );
bool HandleChar( WXWPARAM wParam bool HandleChar( WXWPARAM wParam
,WXLPARAM lParam ,WXLPARAM lParam
,bool bIsASCII = FALSE ,bool bIsASCII = false
); );
bool HandleKeyDown( WXWPARAM wParam bool HandleKeyDown( WXWPARAM wParam
,WXLPARAM lParam ,WXLPARAM lParam

42
include/wx/palmos/window.h
View File

@@ -4,7 +4,7 @@
// Author: William Osborne // Author: William Osborne
// Modified by: // Modified by:
// Created: 10/13/04 // Created: 10/13/04
// RCS-ID: $Id: // RCS-ID: $Id:
// Copyright: (c) William Osborne // Copyright: (c) William Osborne
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@@ -36,12 +36,14 @@
// constants // constants
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// FIXME does anybody use those? they're unused by wxWidgets... #if WXWIN_COMPATIBILITY_2_4
// they're unused by wxWidgets...
enum enum
{ {
wxKEY_SHIFT = 1, wxKEY_SHIFT = 1,
wxKEY_CTRL = 2 wxKEY_CTRL = 2
}; };
#endif
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// wxWindow declaration for Palm // wxWindow declaration for Palm
@@ -79,8 +81,8 @@ public:
virtual void Raise(); virtual void Raise();
virtual void Lower(); virtual void Lower();
virtual bool Show( bool show = TRUE ); virtual bool Show( bool show = true );
virtual bool Enable( bool enable = TRUE ); virtual bool Enable( bool enable = true );
virtual void SetFocus(); virtual void SetFocus();
virtual void SetFocusFromKbd(); virtual void SetFocusFromKbd();
@@ -89,7 +91,7 @@ public:
virtual void WarpPointer(int x, int y); virtual void WarpPointer(int x, int y);
virtual void Refresh( bool eraseBackground = TRUE, virtual void Refresh( bool eraseBackground = true,
const wxRect *rect = (const wxRect *) NULL ); const wxRect *rect = (const wxRect *) NULL );
virtual void Update(); virtual void Update();
virtual void Freeze(); virtual void Freeze();
@@ -113,8 +115,8 @@ public:
#endif // wxUSE_MENUS_NATIVE #endif // wxUSE_MENUS_NATIVE
virtual void SetScrollbar( int orient, int pos, int thumbVisible, virtual void SetScrollbar( int orient, int pos, int thumbVisible,
int range, bool refresh = TRUE ); int range, bool refresh = true );
virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE ); virtual void SetScrollPos( int orient, int pos, bool refresh = true );
virtual int GetScrollPos( int orient ) const; virtual int GetScrollPos( int orient ) const;
virtual int GetScrollThumb( int orient ) const; virtual int GetScrollThumb( int orient ) const;
virtual int GetScrollRange( int orient ) const; virtual int GetScrollRange( int orient ) const;
@@ -134,7 +136,7 @@ public:
#if WXWIN_COMPATIBILITY_2_4 #if WXWIN_COMPATIBILITY_2_4
wxDEPRECATED( bool GetUseCtl3D() const ); wxDEPRECATED( bool GetUseCtl3D() const );
wxDEPRECATED( bool GetTransparentBackground() const ); wxDEPRECATED( bool GetTransparentBackground() const );
wxDEPRECATED( void SetTransparent(bool t = TRUE) ); wxDEPRECATED( void SetTransparent(bool t = true) );
#endif // WXWIN_COMPATIBILITY_2_4 #endif // WXWIN_COMPATIBILITY_2_4
#ifndef __WXUNIVERSAL__ #ifndef __WXUNIVERSAL__
@@ -180,16 +182,16 @@ public:
WXFARPROC PalmGetOldWndProc() const { return m_oldWndProc; } WXFARPROC PalmGetOldWndProc() const { return m_oldWndProc; }
void PalmSetOldWndProc(WXFARPROC proc) { m_oldWndProc = proc; } void PalmSetOldWndProc(WXFARPROC proc) { m_oldWndProc = proc; }
// return TRUE if the window is of a standard (i.e. not wxWidgets') class // return true if the window is of a standard (i.e. not wxWidgets') class
// //
// to understand why does it work, look at SubclassWin() code and comments // to understand why does it work, look at SubclassWin() code and comments
bool IsOfStandardClass() const { return m_oldWndProc != NULL; } bool IsOfStandardClass() const { return m_oldWndProc != NULL; }
wxWindow *FindItem(long id) const; wxWindow *FindItem(long id) const;
wxWindow *FindItemByHWND(WXHWND hWnd, bool controlOnly = FALSE) const; wxWindow *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
// Palm only: TRUE if this control is part of the main control // Palm only: true if this control is part of the main control
virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return FALSE; }; virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; };
// translate wxWidgets style flags for this control into the Windows style // translate wxWidgets style flags for this control into the Windows style
// and optional extended style for the corresponding native control // and optional extended style for the corresponding native control
@@ -208,7 +210,7 @@ public:
// translate wxWidgets coords into Windows ones suitable to be passed to // translate wxWidgets coords into Windows ones suitable to be passed to
// ::CreateWindow() // ::CreateWindow()
// //
// returns TRUE if non default coords are returned, FALSE otherwise // returns true if non default coords are returned, false otherwise
bool PalmGetCreateWindowCoords(const wxPoint& pos, bool PalmGetCreateWindowCoords(const wxPoint& pos,
const wxSize& size, const wxSize& size,
int& x, int& y, int& x, int& y,
@@ -220,7 +222,7 @@ public:
// creates the window of specified Windows class with given style, extended // creates the window of specified Windows class with given style, extended
// style, title and geometry (default values // style, title and geometry (default values
// //
// returns TRUE if the window has been created, FALSE if creation failed // returns true if the window has been created, false if creation failed
bool PalmCreate(const wxChar *wclass, bool PalmCreate(const wxChar *wclass,
const wxChar *title = NULL, const wxChar *title = NULL,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
@@ -260,7 +262,7 @@ public:
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// internal handlers for Palm messages: all handlers return a boolean value: // internal handlers for Palm messages: all handlers return a boolean value:
// TRUE means that the handler processed the event and FALSE that it didn't // true means that the handler processed the event and false that it didn't
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// there are several cases where we have virtual functions for Windows // there are several cases where we have virtual functions for Windows
@@ -328,7 +330,7 @@ public:
bool HandleMouseMove(int x, int y, WXUINT flags); bool HandleMouseMove(int x, int y, WXUINT flags);
bool HandleMouseWheel(WXWPARAM wParam, WXLPARAM lParam); bool HandleMouseWheel(WXWPARAM wParam, WXLPARAM lParam);
bool HandleChar(WXWPARAM wParam, WXLPARAM lParam, bool isASCII = FALSE); bool HandleChar(WXWPARAM wParam, WXLPARAM lParam, bool isASCII = false);
bool HandleKeyDown(WXWPARAM wParam, WXLPARAM lParam); bool HandleKeyDown(WXWPARAM wParam, WXLPARAM lParam);
bool HandleKeyUp(WXWPARAM wParam, WXLPARAM lParam); bool HandleKeyUp(WXWPARAM wParam, WXLPARAM lParam);
#if wxUSE_ACCEL #if wxUSE_ACCEL
@@ -350,14 +352,14 @@ public:
// message processing helpers // message processing helpers
// return FALSE if the message shouldn't be translated/preprocessed but // return false if the message shouldn't be translated/preprocessed but
// dispatched normally // dispatched normally
virtual bool PalmShouldPreProcessMessage(WXMSG* pMsg); virtual bool PalmShouldPreProcessMessage(WXMSG* pMsg);
// return TRUE if the message was preprocessed and shouldn't be dispatched // return true if the message was preprocessed and shouldn't be dispatched
virtual bool PalmProcessMessage(WXMSG* pMsg); virtual bool PalmProcessMessage(WXMSG* pMsg);
// return TRUE if the message was translated and shouldn't be dispatched // return true if the message was translated and shouldn't be dispatched
virtual bool PalmTranslateMessage(WXMSG* pMsg); virtual bool PalmTranslateMessage(WXMSG* pMsg);
// called when the window is about to be destroyed // called when the window is about to be destroyed
@@ -389,7 +391,7 @@ protected:
// the window handle // the window handle
WXHWND m_hWnd; WXHWND m_hWnd;
FormType *FrameForm; FormType *FrameForm;
FormType *GetFormPtr(); FormType *GetFormPtr();
void SetFormPtr(FormType *FormPtr); void SetFormPtr(FormType *FormPtr);