Correct 'markup' for GetResourceHandle after recent change in wx/gdiobj.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2006-10-23 11:58:28 +00:00
parent c07bd710bc
commit 17b1d76b4a
8 changed files with 14 additions and 14 deletions

View File

@ -72,7 +72,7 @@ public:
// Useful helper: create the brush resource
//
bool RealizeResource(void);
WXHANDLE GetResourceHandle(void) ;
virtual WXHANDLE GetResourceHandle(void) const;
bool FreeResource(bool bForce = false);
bool IsFree(void) const;
void Unshare(void);

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: font.h
// Name: wx/os2/font.h
// Purpose: wxFont class
// Author: David Webster
// Modified by:
@ -105,7 +105,7 @@ public:
//
virtual bool IsFree(void) const;
virtual bool RealizeResource(void);
virtual WXHANDLE GetResourceHandle(void);
virtual WXHANDLE GetResourceHandle(void) const;
virtual bool FreeResource(bool bForce = false);
WXHFONT GetHFONT(void) const;

View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Name: include/wx/os2/gdiimage.h
// Name: wx/os2/gdiimage.h
// Purpose: wxGDIImage class: base class for wxBitmap, wxIcon, wxCursor
// under OS/2
// Author: David Webster (adapted from msw version by Vadim Zeitlin)
@ -44,8 +44,8 @@ public:
bool IsOk() const
{
if (m_hHandle == 0)
return FALSE;
return TRUE;
return false;
return true;
}
void SetSize( int nW
@ -226,8 +226,8 @@ public:
pData->m_uId = uId;
}
// forward some of base class virtuals to wxGDIImageRefData
bool FreeResource(bool bForce = FALSE);
virtual WXHANDLE GetResourceHandle();
bool FreeResource(bool bForce = false);
virtual WXHANDLE GetResourceHandle() const;
protected:
// create the data for the derived class here

View File

@ -105,7 +105,7 @@ public:
//
bool RealizeResource(void);
bool FreeResource(bool bForce = false);
WXHANDLE GetResourceHandle(void);
virtual WXHANDLE GetResourceHandle(void) const;
bool IsFree(void) const;
void Unshare(void);

View File

@ -212,7 +212,7 @@ bool wxBrush::RealizeResource()
return false;
} // end of wxBrush::RealizeResource
WXHANDLE wxBrush::GetResourceHandle()
WXHANDLE wxBrush::GetResourceHandle() const
{
if (!M_BRUSHDATA)
return 0;

View File

@ -51,7 +51,7 @@ class WXDLLEXPORT wxFontRefData: public wxGDIRefData
public:
wxFontRefData()
{
Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, FALSE,
Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false,
wxEmptyString, wxFONTENCODING_DEFAULT);
}
@ -948,7 +948,7 @@ bool wxFont::FreeResource( bool WXUNUSED(bForce) )
return false;
} // end of wxFont::FreeResource
WXHANDLE wxFont::GetResourceHandle()
WXHANDLE wxFont::GetResourceHandle() const
{
return GetHFONT();
} // end of wxFont::GetResourceHandle

View File

@ -241,7 +241,7 @@ bool wxGDIImage::FreeResource( bool WXUNUSED(bForce) )
return true;
}
WXHANDLE wxGDIImage::GetResourceHandle()
WXHANDLE wxGDIImage::GetResourceHandle() const
{
return GetHandle();
}

View File

@ -304,7 +304,7 @@ bool wxPen::RealizeResource()
return false;
} // end of wxPen::RealizeResource
WXHANDLE wxPen::GetResourceHandle()
WXHANDLE wxPen::GetResourceHandle() const
{
if (!M_PENDATA)
return 0;