fix the wrong #ifdef WXWIN_COMPATIBILITY_2_8 checks, #if should be used (#9644)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-06-26 11:16:40 +00:00
parent f31f319f0a
commit 831b64f32f
5 changed files with 11 additions and 6 deletions

View File

@@ -17,7 +17,7 @@
//
// please use wxRenderer::DrawBorder() instead of DrawSunkenEdge(); there is no
// replacement for TileBitmap() but it doesn't seem to be very useful anyhow
#ifdef WXWIN_COMPATIBILITY_2_8
#if WXWIN_COMPATIBILITY_2_8
/*
* wxEffects: various 3D effects

View File

@@ -1370,7 +1370,7 @@ public:
// return true if the window was shown, false if hidden
bool IsShown() const { return m_show; }
#ifdef WXWIN_COMPATIBILITY_2_8
#if WXWIN_COMPATIBILITY_2_8
wxDEPRECATED( bool GetShow() const { return IsShown(); } )
#endif
@@ -1397,7 +1397,7 @@ public:
: wxEvent(event)
{ m_iconized = event.m_iconized; }
#ifdef WXWIN_COMPATIBILITY_2_8
#if WXWIN_COMPATIBILITY_2_8
wxDEPRECATED( bool Iconized() const { return IsIconized(); } )
#endif
// return true if the frame was iconized, false if restored

View File

@@ -84,7 +84,7 @@ public:
// check if we have any icons at all
bool IsEmpty() const { return GetIconCount() == 0; }
#ifdef WXWIN_COMPATIBILITY_2_8
#if WXWIN_COMPATIBILITY_2_8
wxDEPRECATED( void AddIcon(const wxString& file, long type)
{
AddIcon(file, (long)type);

View File

@@ -112,7 +112,7 @@ public:
wxBitmapType GetType() const { return m_type; }
const wxString& GetMimeType() const { return m_mime; }
#ifdef WXWIN_COMPATIBILITY_2_8
#if WXWIN_COMPATIBILITY_2_8
wxDEPRECATED(
void SetType(long type) { SetType((wxBitmapType)type); }
)
@@ -434,7 +434,7 @@ public:
static HSVValue RGBtoHSV(const RGBValue& rgb);
static RGBValue HSVtoRGB(const HSVValue& hsv);
#ifdef WXWIN_COMPATIBILITY_2_8
#if WXWIN_COMPATIBILITY_2_8
wxDEPRECATED(
wxImage(const wxString& name, long type, int index = -1)
{

View File

@@ -25,6 +25,8 @@
#include "wx/gdicmn.h"
#endif //WX_PRECOMP
#if WXWIN_COMPATIBILITY_2_8
/*
* wxEffectsImpl: various 3D effects
*/
@@ -122,3 +124,6 @@ bool wxEffectsImpl::TileBitmap(const wxRect& rect, wxDC& dc, const wxBitmap& bit
return true;
}
#endif // WXWIN_COMPATIBILITY_2_8