add IsOk() to all classes having Ok() method (patch 1570985)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-08 21:56:55 +00:00
parent dd61e8ed01
commit b7cacb43db
161 changed files with 316 additions and 203 deletions

View File

@@ -45,7 +45,8 @@ public:
inline bool operator!= (const wxAcceleratorTable& rAccel) const
{ return m_refData != rAccel.m_refData; };
bool Ok() const;
bool Ok() const { return IsOk(); }
bool IsOk() const;
void SetHACCEL(WXHACCEL hAccel);
WXHACCEL GetHACCEL(void) const;

View File

@@ -61,7 +61,8 @@ public:
inline wxBitmap* GetStipple(void) const { return (M_BRUSHDATA ? & M_BRUSHDATA->m_vStipple : 0); };
inline int GetPS(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_hBrush : 0); };
inline virtual bool Ok(void) const { return (m_refData != NULL) ; }
inline virtual bool Ok() const { return IsOk(); }
inline virtual bool IsOk(void) const { return (m_refData != NULL) ; }
//
// Implementation

View File

@@ -34,7 +34,8 @@ public:
virtual ~wxColour();
// Accessors
bool Ok(void) const {return m_bIsInit; }
bool Ok() const { return IsOk(); }
bool IsOk(void) const {return m_bIsInit; }
unsigned char Red(void) const { return m_cRed; }
unsigned char Green(void) const { return m_cGreen; }

View File

@@ -187,7 +187,8 @@ public:
pData->m_hHandle = hHandle;
}
bool Ok() const { return GetHandle() != 0; }
bool Ok() const { return IsOk(); }
bool IsOk() const { return GetHandle() != 0; }
int GetWidth() const { return IsNull() ? 0 : GetGDIImageData()->m_nWidth; }
int GetHeight() const { return IsNull() ? 0 : GetGDIImageData()->m_nHeight; }

View File

@@ -58,7 +58,8 @@ public:
virtual bool SetClipboard(int width = 0, int height = 0);
virtual bool Play(wxDC *dc);
inline bool Ok(void) const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); };
inline bool Ok() const { return IsOk(); }
inline bool IsOk(void) const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); };
// Implementation
inline WXHANDLE GetHMETAFILE(void) { return M_METAFILEDATA->m_metafile; }

View File

@@ -59,7 +59,8 @@ public:
,unsigned char* pBlue
) const;
virtual bool Ok(void) const { return (m_refData != NULL) ; }
virtual bool Ok() const { return IsOk(); }
virtual bool IsOk(void) const { return (m_refData != NULL) ; }
inline bool operator == (const wxPalette& rPalette) const
{ return m_refData == rPalette.m_refData; }

View File

@@ -61,7 +61,8 @@ public:
inline bool operator != (const wxPen& rPen) const
{ return m_refData != rPen.m_refData; }
virtual bool Ok(void) const { return (m_refData != NULL); }
virtual bool Ok() const { return IsOk(); }
virtual bool IsOk(void) const { return (m_refData != NULL); }
//
// Override in order to recreate the pen

View File

@@ -88,7 +88,8 @@ public:
virtual bool InstantiateBitmap(wxBitmap *bitmap);
wxMask *CreateMask(void);
inline bool Ok(void) { return imageOK; }
inline bool Ok() const { return IsOk(); }
inline bool IsOk(void) { return imageOK; }
};
class wxPNGReaderIter