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

removed WXWIN_COMPATIBILITY and WXWIN_COMPATIBILITY_2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-17 12:50:53 +00:00
parent 4a93ea29b5
commit a3bf7524f3
79 changed files with 12 additions and 2012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/os2/bitmap.h
View File

@@ -194,19 +194,6 @@ public:
inline bool operator!=(const wxBitmap& rBitmap) const
{ return m_refData != rBitmap.m_refData; }
#if WXWIN_COMPATIBILITY_2
void SetOk(bool bIsOk);
#endif // WXWIN_COMPATIBILITY_2
#if WXWIN_COMPATIBILITY
inline wxPalette* GetColourMap() const
{ return GetPalette(); }
inline void SetColourMap(wxPalette* pCmap)
{ SetPalette(*pCmap); };
#endif // WXWIN_COMPATIBILITY
// Implementation
public:
inline void SetHBITMAP(WXHBITMAP hBmp)

7
include/wx/os2/bmpbuttn.h
View File

@@ -62,13 +62,6 @@ public:
SetBitmapLabel(rBitmap);
}
#if WXWIN_COMPATIBILITY
wxBitmap* GetBitmap(void) const
{
return (wxBitmap *)&m_buttonBitmap;
}
#endif
//
// Implementation
//

10
include/wx/os2/colour.h
View File

@@ -83,16 +83,6 @@ public:
//
bool Ok(void) const {return m_bIsInit; }
//
// Let's remove this inelegant function
//
#if WXWIN_COMPATIBILITY
void Get( unsigned char* pRed
,unsigned char* pGreen
,unsigned char* pBlue
) const;
#endif
unsigned char Red(void) const { return m_cRed; }
unsigned char Green(void) const { return m_cGreen; }
unsigned char Blue(void) const { return m_cBlue; }

17
include/wx/os2/control.h
View File

@@ -81,16 +81,6 @@ public:
,WXLPARAM lParam
);
#if WXWIN_COMPATIBILITY
virtual void SetButtonColour(const wxColour& WXUNUSED(rCol)) { }
wxColour* GetButtonColour(void) const { return NULL; }
inline virtual void SetLabelFont(const wxFont& rFont);
inline virtual void SetButtonFont(const wxFont& rFont);
inline wxFont& GetLabelFont(void) const;
inline wxFont& GetButtonFont(void) const;
#endif // WXWIN_COMPATIBILITY
public:
//
// For controls like radiobuttons which are really composite
@@ -138,12 +128,5 @@ private:
DECLARE_EVENT_TABLE()
}; // end of wxControl
#if WXWIN_COMPATIBILITY
inline wxFont& wxControl::GetLabelFont(void) const { return GetFont(); }
inline wxFont& wxControl::GetButtonFont(void) const { return GetFont(); }
inline void wxControl::SetLabelFont(const wxFont& rFont) { SetFont(rFont); }
inline void wxControl::SetButtonFont(const wxFont& rFont) { SetFont(rFont); }
#endif // WXWIN_COMPATIBILITY
#endif // _WX_CONTROL_H_

11
include/wx/os2/gdiimage.h
View File

@@ -40,10 +40,6 @@ public:
m_nWidth = m_nHeight = m_nDepth = 0;
m_hHandle = 0;
#if WXWIN_COMPATIBILITY_2
m_bOk = FALSE;
#endif // WXWIN_COMPATIBILITY_2
}
// accessors
@@ -80,13 +76,6 @@ public:
WXHCURSOR m_hCursor;
};
// this filed is redundant and using it is error prone but keep it for
// backwards compatibility
#if WXWIN_COMPATIBILITY_2
void SetOk() { m_bOk = m_hHandle != 0; }
bool m_bOk;
#endif // WXWIN_COMPATIBILITY_2
UINT m_uId;
};

14
include/wx/os2/menu.h
View File

@@ -230,16 +230,6 @@ public:
);
virtual wxString GetLabelTop(size_t nPos) const;
//
// Compatibility: these functions are deprecated
//
#if WXWIN_COMPATIBILITY
void SetEventHandler(wxEvtHandler* pHandler) { m_pEventHandler = pHandler; }
wxEvtHandler* GetEventHandler(void) { return m_pEventHandler; }
bool Enabled(int nId) const { return IsEnabled(nId); }
bool Checked(int nId) const { return IsChecked(nId); }
#endif // WXWIN_COMPATIBILITY
//
// Implementation from now on
//
@@ -275,10 +265,6 @@ protected:
//
void Init(void);
#if WXWIN_COMPATIBILITY
wxEvtHandler* m_pEventHandler;
#endif // WXWIN_COMPATIBILITY
wxArrayString m_titles;
WXHMENU m_hMenu;

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

@@ -152,47 +152,6 @@ public:
// Accept files for dragging
virtual void DragAcceptFiles(bool bAccept);
#if WXWIN_COMPATIBILITY
// Set/get scroll attributes
virtual void SetScrollRange( int nOrient
,int nRange
,bool bRefresh = TRUE
);
virtual void SetScrollPage( int nOrient
,int nPage
,bool bRefresh = TRUE
);
virtual int OldGetScrollRange(int nOrient) const;
virtual int GetScrollPage(int nOrient) const;
//
// event handlers
//
// Handle a control command
virtual void OnCommand( wxWindow& rWin
,wxCommandEvent& rEvent
);
// Override to define new behaviour for default action (e.g. double
// clicking on a listbox)
virtual void OnDefaultAction(wxControl* WXUNUSED(pInitiatingItem)) { }
#endif // WXWIN_COMPATIBILITY
#if wxUSE_CARET && WXWIN_COMPATIBILITY
void CreateCaret( int nWidth
,int nHeight
);
void CreateCaret(const wxBitmap* pBitmap);
void DestroyCaret(void);
void ShowCaret(bool bShow);
void SetCaretPos( int nX
,int nY
);
void GetCaretPos( int* pX
,int* pY
) const;
#endif // wxUSE_CARET
#ifndef __WXUNIVERSAL__
// Native resource loading (implemented in src/os2/nativdlg.cpp)
// FIXME: should they really be all virtual?
@@ -293,13 +252,6 @@ public:
,WXWORD nId
);
#if WXWIN_COMPATIBILITY
wxObject* GetChild(int nNumber) const;
virtual void OS2DeviceToLogical( float* pfX
,float* pfY
) const;
#endif // WXWIN_COMPATIBILITY
#ifndef __WXUNIVERSAL__
// Create an appropriate wxWindow from a HWND
virtual wxWindow* CreateWindowFromHWND( wxWindow* pParent
@@ -469,11 +421,6 @@ public:
,WXLPARAM lParam
);
#if WXWIN_COMPATIBILITY
void SetShowing(bool bShow) { (void)Show(show); }
bool IsUserEnabled(void) const { return IsEnabled(); }
#endif // WXWIN_COMPATIBILITY
// Responds to colour changes: passes event on to children.
void OnSysColourChanged(wxSysColourChangedEvent& rEvent);