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

diff --git a/docs/changes.txt b/docs/changes.txt
index 8637c9deee2e71a16f3f630803f5827456e02fe5..e07d2c0d322ac98b573c4bcffa01d4ed622e0150 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -61,6 +61,8 @@ All:
 - Added wxLocale::IsAvailable() (Creighton).
 - Added Malay translations (Mahrazi Mohd Kamal)
 - Added reference counting for wxVariant
 - Added wxLocale::IsAvailable() (Creighton).
 - Added Malay translations (Mahrazi Mohd Kamal)
 - Added reference counting for wxVariant

+- For consistency, all classes having Ok() method now also have IsOk() one, use
+  of the latter form is preferred although the former hasn't been deprecated yet

 
 All (GUI):
 
 
 All (GUI):
 

diff --git a/docs/latex/wx/accel.tex b/docs/latex/wx/accel.tex
index 03d9933377c0fb6e5be24a53ff641488da60fd10..266fa9a83e01ee5982843e91301d0ddd1aa3c14f 100644 (file)
--- a/docs/latex/wx/accel.tex
+++ b/docs/latex/wx/accel.tex
@@ -151,9 +151,9 @@ and cmd values like you would construct wxAcceleratorEntry objects with.}
 
 Destroys the wxAcceleratorTable object.
 
 
 Destroys the wxAcceleratorTable object.
 

-\membersection{wxAcceleratorTable::Ok}\label{wxacceleratortableok}
+\membersection{wxAcceleratorTable::IsOk}\label{wxacceleratortableisok}

 
 

-\constfunc{bool}{Ok}{\void}
+\constfunc{bool}{IsOk}{\void}

 
 Returns true if the accelerator table is valid.
 
 
 Returns true if the accelerator table is valid.
 

diff --git a/docs/latex/wx/bitmap.tex b/docs/latex/wx/bitmap.tex
index f75303f6f2933f9907aabcd2d7f1f7592e39c196..b2c94b7599f7459a12111abb3093869a182bbafd 100644 (file)
--- a/docs/latex/wx/bitmap.tex
+++ b/docs/latex/wx/bitmap.tex
@@ -449,9 +449,9 @@ if one has been created by using the \helpref{GetPalette}{wxbitmapgetpalette} me
 
 \helpref{wxBitmap::SaveFile}{wxbitmapsavefile}
 
 
 \helpref{wxBitmap::SaveFile}{wxbitmapsavefile}
 

-\membersection{wxBitmap::Ok}\label{wxbitmapok}
+\membersection{wxBitmap::IsOk}\label{wxbitmapisok}

 
 

-\constfunc{bool}{Ok}{\void}
+\constfunc{bool}{IsOk}{\void}

 
 Returns true if bitmap data is present.
 
 
 Returns true if bitmap data is present.
 

diff --git a/docs/latex/wx/brush.tex b/docs/latex/wx/brush.tex
index 3449e8cdf167f66e93eab5d52a3a9b2770cd99cc..0b3a4502d6f2d0cd9d25b15c9b431b7ac1158cb7 100644 (file)
--- a/docs/latex/wx/brush.tex
+++ b/docs/latex/wx/brush.tex
@@ -78,7 +78,7 @@ data using the reference counting, are not affected.
 
 \func{}{wxBrush}{\void}
 
 
 \func{}{wxBrush}{\void}
 

-Default constructor. The brush will be uninitialised, and \helpref{wxBrush::Ok}{wxbrushok} will
+Default constructor. The brush will be uninitialised, and \helpref{wxBrush:IsOk}{wxbrushisok} will

 return false.
 
 \func{}{wxBrush}{\param{const wxColour\&}{ colour}, \param{int}{ style = {\tt wxSOLID}}}
 return false.
 
 \func{}{wxBrush}{\param{const wxColour\&}{ colour}, \param{int}{ style = {\tt wxSOLID}}}


@@ -163,7 +163,7 @@ Returns a reference to the brush colour.
 \constfunc{wxBitmap *}{GetStipple}{\void}
 
 Gets a pointer to the stipple bitmap. If the brush does not have a wxSTIPPLE style,
 \constfunc{wxBitmap *}{GetStipple}{\void}
 
 Gets a pointer to the stipple bitmap. If the brush does not have a wxSTIPPLE style,

-this bitmap may be non-NULL but uninitialised (\helpref{wxBitmap::Ok}{wxbitmapok} returns false).
+this bitmap may be non-NULL but uninitialised (\helpref{wxBitmap:IsOk}{wxbitmapisok} returns false).

 
 \wxheading{See also}
 
 
 \wxheading{See also}
 


@@ -206,9 +206,9 @@ Returns true if the style of the brush is any of hatched fills.
 \helpref{wxBrush::GetStyle}{wxbrushgetstyle}
 
 
 \helpref{wxBrush::GetStyle}{wxbrushgetstyle}
 
 

-\membersection{wxBrush::Ok}\label{wxbrushok}
+\membersection{wxBrush::IsOk}\label{wxbrushisok}

 
 

-\constfunc{bool}{Ok}{\void}
+\constfunc{bool}{IsOk}{\void}

 
 Returns true if the brush is initialised. It will return false if the default
 constructor has been used (for example, the brush is a member of a class, or
 
 Returns true if the brush is initialised. It will return false if the default
 constructor has been used (for example, the brush is a member of a class, or

diff --git a/docs/latex/wx/colour.tex b/docs/latex/wx/colour.tex
index 5c69c5e7177072b00cd705b85a0de60d17594f1f..341d51e15339f0b07af1ea915dca3c055241ed01 100644 (file)
--- a/docs/latex/wx/colour.tex
+++ b/docs/latex/wx/colour.tex
@@ -146,9 +146,9 @@ On X, an allocated pixel value is returned.
 Returns the green intensity.
 
 
 Returns the green intensity.
 
 

-\membersection{wxColour::Ok}\label{wxcolourok}
+\membersection{wxColour::IsOk}\label{wxcolourisok}

 
 

-\constfunc{bool}{Ok}{\void}
+\constfunc{bool}{IsOk}{\void}

 
 Returns \true if the colour object is valid (the colour has been initialised with RGB values).
 
 
 Returns \true if the colour object is valid (the colour has been initialised with RGB values).
 


@@ -378,7 +378,7 @@ removed in the next wxWidgets version, please don't use it.
 \func{wxColour}{Find}{\param{const wxString\& }{colourName}}
 
 Finds a colour given the name. Returns an invalid colour object (that is, such
 \func{wxColour}{Find}{\param{const wxString\& }{colourName}}
 
 Finds a colour given the name. Returns an invalid colour object (that is, such

-that its \helpref{Ok()}{wxcolourok} method returns \false) if the colour wasn't
+that its \helpref{Ok()}{wxcolourisok} method returns \false) if the colour wasn't

 found in the database.
 
 
 found in the database.
 
 

diff --git a/docs/latex/wx/cursor.tex b/docs/latex/wx/cursor.tex
index 3f3d1a5d2490e9414d62b7d9daea5ac750c61f7e..8821d5775f1043f478aeb7b9ac295b874effd086 100644 (file)
--- a/docs/latex/wx/cursor.tex
+++ b/docs/latex/wx/cursor.tex
@@ -234,9 +234,9 @@ than one window, and does not get destroyed when the window is
 destroyed. wxWidgets destroys all cursors on application exit, although
 it is best to clean them up explicitly.
 
 destroyed. wxWidgets destroys all cursors on application exit, although
 it is best to clean them up explicitly.
 

-\membersection{wxCursor::Ok}\label{wxcursorok}
+\membersection{wxCursor::IsOk}\label{wxcursorisok}

 
 

-\constfunc{bool}{Ok}{\void}
+\constfunc{bool}{IsOk}{\void}

 
 Returns true if cursor data is present.
 
 
 Returns true if cursor data is present.
 

diff --git a/docs/latex/wx/dc.tex b/docs/latex/wx/dc.tex
index e0f3256f499c1c592a4992fc047ff08e30c8fb1a..cbfb91daee90156fb8806da07d78fd17dd58721d 100644 (file)
--- a/docs/latex/wx/dc.tex
+++ b/docs/latex/wx/dc.tex
@@ -883,7 +883,7 @@ Gets the minimum horizontal extent used in drawing commands so far.
 Gets the minimum vertical extent used in drawing commands so far.
 
 
 Gets the minimum vertical extent used in drawing commands so far.
 
 

-\membersection{wxDC::Ok}\label{wxdcok}
+\membersection{wxDC::IsOk}\label{wxdcisok}

 
 \func{bool}{Ok}{\void}
 
 
 \func{bool}{Ok}{\void}
 

diff --git a/docs/latex/wx/ffilestr.tex b/docs/latex/wx/ffilestr.tex
index 7f80db61313b9cbdc706f45049ea633df42a4ea1..197c62e7b1487c763e0c18bd7cb896cb65e0a73d 100644 (file)
--- a/docs/latex/wx/ffilestr.tex
+++ b/docs/latex/wx/ffilestr.tex
@@ -49,9 +49,9 @@ Initializes a file stream in read-only mode using the specified file pointer {\i
 
 Destructor.
 
 
 Destructor.
 

-\membersection{wxFFileInputStream::Ok}\label{wxffileinputstreamok}
+\membersection{wxFFileInputStream::IsOk}\label{wxffileinputstreamisok}

 
 

-\constfunc{bool}{Ok}{\void}
+\constfunc{bool}{IsOk}{\void}

 
 Returns true if the stream is initialized and ready.
 
 
 Returns true if the stream is initialized and ready.
 


@@ -106,9 +106,9 @@ Initializes a file stream in write-only mode using the file descriptor {\it fp}.
 
 Destructor.
 
 
 Destructor.
 

-\membersection{wxFFileOutputStream::Ok}\label{wxffileoutputstreamok}
+\membersection{wxFFileOutputStream::IsOk}\label{wxffileoutputstreamisok}

 
 

-\constfunc{bool}{Ok}{\void}
+\constfunc{bool}{IsOk}{\void}

 
 Returns true if the stream is initialized and ready.
 
 
 Returns true if the stream is initialized and ready.
 

diff --git a/docs/latex/wx/fileistr.tex b/docs/latex/wx/fileistr.tex
index 01599e845417a6800ff5bfa8471ac04f63d7657d..dee49fce2439de6f81d0c4f573fd2c8637b57023 100644 (file)
--- a/docs/latex/wx/fileistr.tex
+++ b/docs/latex/wx/fileistr.tex
@@ -46,9 +46,9 @@ Initializes a file stream in read-only mode using the specified file descriptor.
 
 Destructor.
 
 
 Destructor.
 

-\membersection{wxFileInputStream::Ok}\label{wxfileinputstreamok}
+\membersection{wxFileInputStream::IsOk}\label{wxfileinputstreamisok}

 
 

-\constfunc{bool}{Ok}{\void}
+\constfunc{bool}{IsOk}{\void}

 
 Returns true if the stream is initialized and ready.
 
 
 Returns true if the stream is initialized and ready.
 

diff --git a/docs/latex/wx/fileostr.tex b/docs/latex/wx/fileostr.tex
index 21ce65dd75b80dfd77face02db7ea55617ceca95..a1f09efb670b9073f8e1c65d561d287e1fbf0863 100644 (file)
--- a/docs/latex/wx/fileostr.tex
+++ b/docs/latex/wx/fileostr.tex
@@ -50,9 +50,9 @@ Initializes a file stream in write-only mode using the file descriptor {\it fd}.
 
 Destructor.
 
 
 Destructor.
 

-\membersection{wxFileOutputStream::Ok}\label{wxfileoutputstreamok}
+\membersection{wxFileOutputStream::IsOk}\label{wxfileoutputstreamisok}

 
 

-\constfunc{bool}{Ok}{\void}
+\constfunc{bool}{IsOk}{\void}

 
 Returns true if the stream is initialized and ready.
 
 
 Returns true if the stream is initialized and ready.
 

diff --git a/docs/latex/wx/font.tex b/docs/latex/wx/font.tex
index 5561188f3d85932380424b5c38ece61789161c53..f520000102bf00f4694fd1cc1aab0bf8e0d8dbb0 100644 (file)
--- a/docs/latex/wx/font.tex
+++ b/docs/latex/wx/font.tex
@@ -397,9 +397,9 @@ Using \texttt{New()} is currently the only way to directly create a font with
 the given size in pixels on platforms other than wxMSW.
 
 
 the given size in pixels on platforms other than wxMSW.
 
 

-\membersection{wxFont::Ok}\label{wxfontok}
+\membersection{wxFont::IsOk}\label{wxfontisok}

 
 

-\constfunc{bool}{Ok}{\void}
+\constfunc{bool}{IsOk}{\void}

 
 Returns {\tt true} if this object is a valid font, {\tt false} otherwise.
 
 
 Returns {\tt true} if this object is a valid font, {\tt false} otherwise.
 

diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex
index bf0618a1e720267560131704e4826885de6def14..ad94c6e4f54f10ab26eeeb86f5e1f433c98c6544 100644 (file)
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -2004,7 +2004,7 @@ customization.
 \func{wxColour}{wxGetColourFromUser}{\param{wxWindow *}{parent}, \param{const wxColour\& }{colInit}, \param{const wxString\& }{caption = wxEmptyString}}
 
 Shows the colour selection dialog and returns the colour selected by user or
 \func{wxColour}{wxGetColourFromUser}{\param{wxWindow *}{parent}, \param{const wxColour\& }{colInit}, \param{const wxString\& }{caption = wxEmptyString}}
 
 Shows the colour selection dialog and returns the colour selected by user or

-invalid colour (use \helpref{wxColour::Ok}{wxcolourok} to test whether a colour
+invalid colour (use \helpref{wxColour:IsOk}{wxcolourisok} to test whether a colour

 is valid) if the dialog was cancelled.
 
 \wxheading{Parameters}
 is valid) if the dialog was cancelled.
 
 \wxheading{Parameters}


@@ -2025,7 +2025,7 @@ is valid) if the dialog was cancelled.
 \func{wxFont}{wxGetFontFromUser}{\param{wxWindow *}{parent}, \param{const wxFont\& }{fontInit}, \param{const wxString\& }{caption = wxEmptyString}}
 
 Shows the font selection dialog and returns the font selected by user or
 \func{wxFont}{wxGetFontFromUser}{\param{wxWindow *}{parent}, \param{const wxFont\& }{fontInit}, \param{const wxString\& }{caption = wxEmptyString}}
 
 Shows the font selection dialog and returns the font selected by user or

-invalid font (use \helpref{wxFont::Ok}{wxfontok} to test whether a font
+invalid font (use \helpref{wxFont:IsOk}{wxfontisok} to test whether a font

 is valid) if the dialog was cancelled.
 
 \wxheading{Parameters}
 is valid) if the dialog was cancelled.
 
 \wxheading{Parameters}

diff --git a/docs/latex/wx/icon.tex b/docs/latex/wx/icon.tex
index 75319cf0b138b88fe0f8bf911a28841b91816cb5..e1df5b3e7d58a0d168644299b76d3df6a066d83a 100644 (file)
--- a/docs/latex/wx/icon.tex
+++ b/docs/latex/wx/icon.tex
@@ -277,9 +277,9 @@ true if the operation succeeded, false otherwise.
 
 \helpref{wxIcon::wxIcon}{wxiconctor}
 
 
 \helpref{wxIcon::wxIcon}{wxiconctor}
 

-\membersection{wxIcon::Ok}\label{wxiconok}
+\membersection{wxIcon::IsOk}\label{wxiconisok}

 
 

-\constfunc{bool}{Ok}{\void}
+\constfunc{bool}{IsOk}{\void}

 
 Returns true if icon data is present.
 
 
 Returns true if icon data is present.
 

diff --git a/docs/latex/wx/image.tex b/docs/latex/wx/image.tex
index c15a01e9508e899a58a6a9263baf4bf18ea956c5..b78c101efa85f75bbc3a55366d40ab41f727cb0f 100644 (file)
--- a/docs/latex/wx/image.tex
+++ b/docs/latex/wx/image.tex
@@ -884,9 +884,9 @@ mimetype from a file}
 
 
 
 
 
 

-\membersection{wxImage::Ok}\label{wximageok}
+\membersection{wxImage::IsOk}\label{wximageisok}

 
 

-\constfunc{bool}{Ok}{\void}
+\constfunc{bool}{IsOk}{\void}

 
 Returns true if image data is present.
 
 
 Returns true if image data is present.
 

diff --git a/docs/latex/wx/metafile.tex b/docs/latex/wx/metafile.tex
index f7d7f0d5ddb789013f6c5a8903613a214c136e6e..111e5697f7be888392fee829ad31bb5946140e72 100644 (file)
--- a/docs/latex/wx/metafile.tex
+++ b/docs/latex/wx/metafile.tex
@@ -26,7 +26,7 @@ is to use a wxMetafileDC.
 
 Constructor. If a filename is given, the Windows disk metafile is
 read in. Check whether this was performed successfully by
 
 Constructor. If a filename is given, the Windows disk metafile is
 read in. Check whether this was performed successfully by

-using the \helpref{wxMetafile::Ok}{wxmetafileok} member.
+using the \helpref{wxMetafile:IsOk}{wxmetafileisok} member.

 
 \membersection{wxMetafile::\destruct{wxMetafile}}\label{wxmetafiledtor}
 
 
 \membersection{wxMetafile::\destruct{wxMetafile}}\label{wxmetafiledtor}
 


@@ -34,7 +34,7 @@ using the \helpref{wxMetafile::Ok}{wxmetafileok} member.
 
 Destructor.
 
 
 Destructor.
 

-\membersection{wxMetafile::Ok}\label{wxmetafileok}
+\membersection{wxMetafile::IsOk}\label{wxmetafileisok}

 
 \func{bool}{Ok}{\void}
 
 
 \func{bool}{Ok}{\void}
 

diff --git a/docs/latex/wx/pagedlg.tex b/docs/latex/wx/pagedlg.tex
index 8ca71e6c9196fe9042d834389754c54d930310e8..ba223977e33721b068ccd636c091d321d14c5081 100644 (file)
--- a/docs/latex/wx/pagedlg.tex
+++ b/docs/latex/wx/pagedlg.tex
@@ -50,9 +50,9 @@ Destructor.
 
 Returns the \helpref{page setup data}{wxpagesetupdialogdata} associated with the dialog.
 
 
 Returns the \helpref{page setup data}{wxpagesetupdialogdata} associated with the dialog.
 

-%\membersection{wxPageSetupDialog::Ok}\label{wxpagesetupdialogok}
+%\membersection{wxPageSetupDialog::IsOk}\label{wxpagesetupdialogisok}

 %
 %

-%\constfunc{bool}{Ok}{\void}
+%\constfunc{bool}{IsOk}{\void}

 %
 %Returns true if the print data associated with the dialog data is valid.
 %This can return false on Windows if the current printer is not set, for example.
 %
 %Returns true if the print data associated with the dialog data is valid.
 %This can return false on Windows if the current printer is not set, for example.


@@ -226,9 +226,9 @@ Returns the paper size in millimetres.
 
 Returns a reference to the \helpref{print data}{wxprintdata} associated with this object.
 
 
 Returns a reference to the \helpref{print data}{wxprintdata} associated with this object.
 

-\membersection{wxPageSetupDialogData::Ok}\label{wxpagesetupdialogdataok}
+\membersection{wxPageSetupDialogData::IsOk}\label{wxpagesetupdialogdataisok}

 
 

-\constfunc{bool}{Ok}{\void}
+\constfunc{bool}{IsOk}{\void}

 
 Returns true if the print data associated with the dialog data is valid.
 This can return false on Windows if the current printer is not set, for example.
 
 Returns true if the print data associated with the dialog data is valid.
 This can return false on Windows if the current printer is not set, for example.

diff --git a/docs/latex/wx/palette.tex b/docs/latex/wx/palette.tex
index 2b2eeefbac80ce119d43ad4fb1da6f886299e7a9..706881b88bcb4ae7cbed422ff33e6b86d7e57d4f 100644 (file)
--- a/docs/latex/wx/palette.tex
+++ b/docs/latex/wx/palette.tex
@@ -170,9 +170,9 @@ true if the operation was successful.
 \perlnote{In wxPerl this method takes only the {\tt pixel} parameter and
   returns a 3-element list ( or the empty list upon failure ).}
 
 \perlnote{In wxPerl this method takes only the {\tt pixel} parameter and
   returns a 3-element list ( or the empty list upon failure ).}
 

-\membersection{wxPalette::Ok}\label{wxpaletteok}
+\membersection{wxPalette::IsOk}\label{wxpaletteisok}

 
 

-\constfunc{bool}{Ok}{\void}
+\constfunc{bool}{IsOk}{\void}

 
 Returns true if palette data is present.
 
 
 Returns true if palette data is present.
 

diff --git a/docs/latex/wx/pen.tex b/docs/latex/wx/pen.tex
index ae9677b3ba17bac9095fb9dd36f42e5adbc778a7..98841425e79fcc4ba9b121745796c7eeed1a3699 100644 (file)
--- a/docs/latex/wx/pen.tex
+++ b/docs/latex/wx/pen.tex
@@ -76,7 +76,7 @@ data using the reference counting, are not affected.
 
 \func{}{wxPen}{\void}
 
 
 \func{}{wxPen}{\void}
 

-Default constructor. The pen will be uninitialised, and \helpref{wxPen::Ok}{wxpenok} will
+Default constructor. The pen will be uninitialised, and \helpref{wxPen:IsOk}{wxpenisok} will

 return false.
 
 \func{}{wxPen}{\param{const wxColour\&}{ colour}, \param{int}{ width = $1$}, \param{int}{ style = {\tt wxSOLID}}}
 return false.
 
 \func{}{wxPen}{\param{const wxColour\&}{ colour}, \param{int}{ width = $1$}, \param{int}{ style = {\tt wxSOLID}}}


@@ -239,9 +239,9 @@ Returns the pen width.
 
 \helpref{wxPen::SetWidth}{wxpensetwidth}
 
 
 \helpref{wxPen::SetWidth}{wxpensetwidth}
 

-\membersection{wxPen::Ok}\label{wxpenok}
+\membersection{wxPen::IsOk}\label{wxpenisok}

 
 

-\constfunc{bool}{Ok}{\void}
+\constfunc{bool}{IsOk}{\void}

 
 Returns true if the pen is initialised.
 
 
 Returns true if the pen is initialised.
 

diff --git a/docs/latex/wx/print.tex b/docs/latex/wx/print.tex
index cc02e3158d952de0f3087048760f92aa5a7e8a52..34dadf664c12b4eb467112e7b8d853457f8f2fef 100644 (file)
--- a/docs/latex/wx/print.tex
+++ b/docs/latex/wx/print.tex
@@ -155,9 +155,9 @@ On input you should pass one of these identifiers, but on return you may get bac
 indicating the current resolution setting.
 
 
 indicating the current resolution setting.
 
 

-\membersection{wxPrintData::Ok}\label{wxprintdataok}
+\membersection{wxPrintData::IsOk}\label{wxprintdataisok}

 
 

-\constfunc{bool}{Ok}{\void}
+\constfunc{bool}{IsOk}{\void}

 
 Returns true if the print data is valid for using in print dialogs.
 This can return false on Windows if the current printer is not set, for example.
 
 Returns true if the print data is valid for using in print dialogs.
 This can return false on Windows if the current printer is not set, for example.


@@ -562,9 +562,9 @@ a concept specific to the application).
 Returns the {\it to} page number, as entered by the user.
 
 
 Returns the {\it to} page number, as entered by the user.
 
 

-\membersection{wxPrintDialogData::Ok}\label{wxprintdialogdataok}
+\membersection{wxPrintDialogData::IsOk}\label{wxprintdialogdataisok}

 
 

-\constfunc{bool}{Ok}{\void}
+\constfunc{bool}{IsOk}{\void}

 
 Returns true if the print data is valid for using in print dialogs.
 This can return false on Windows if the current printer is not set, for example.
 
 Returns true if the print data is valid for using in print dialogs.
 This can return false on Windows if the current printer is not set, for example.


@@ -1135,7 +1135,7 @@ Gets the printout object to be used for printing from within the preview interfa
 or NULL if none exists.
 
 
 or NULL if none exists.
 
 

-\membersection{wxPrintPreview::Ok}\label{wxprintpreviewok}
+\membersection{wxPrintPreview::IsOk}\label{wxprintpreviewisok}

 
 \func{bool}{Ok}{\void}
 
 
 \func{bool}{Ok}{\void}
 

diff --git a/docs/latex/wx/socket.tex b/docs/latex/wx/socket.tex
index 04a2515b898cbdad49e9f5cefb9590ef180d8f33..de3c5c5a88d708c04dbe246862400fdead31745f 100644 (file)
--- a/docs/latex/wx/socket.tex
+++ b/docs/latex/wx/socket.tex
@@ -127,7 +127,7 @@ Functions to retrieve current state and miscellaneous info.
 \helpref{IsDisconnected}{wxsocketbaseisdisconnected}\\
 \helpref{LastCount}{wxsocketbaselastcount}\\
 \helpref{LastError}{wxsocketbaselasterror}\\
 \helpref{IsDisconnected}{wxsocketbaseisdisconnected}\\
 \helpref{LastCount}{wxsocketbaselastcount}\\
 \helpref{LastError}{wxsocketbaselasterror}\\

-\helpref{Ok}{wxsocketbaseok}\\
+\helpref{IsOk}{wxsocketbaseisok}\\

 \helpref{SaveState}{wxsocketbasesavestate}\\
 \helpref{RestoreState}{wxsocketbaserestorestate}
 
 \helpref{SaveState}{wxsocketbasesavestate}\\
 \helpref{RestoreState}{wxsocketbaserestorestate}
 


@@ -414,11 +414,11 @@ be sent to the application. If {\it notify} is false; no events
 will be sent.
 
 % 
 will be sent.
 
 % 

-% Ok
+% IsOk

 %
 %

-\membersection{wxSocketBase::Ok}\label{wxsocketbaseok}
+\membersection{wxSocketBase::IsOk}\label{wxsocketbaseisok}

 
 

-\constfunc{bool}{Ok}{\void}
+\constfunc{bool}{IsOk}{\void}

 
 Returns true if the socket is initialized and ready and false in other
 cases.
 
 Returns true if the socket is initialized and ready and false in other
 cases.

diff --git a/docs/latex/wx/socksrv.tex b/docs/latex/wx/socksrv.tex
index f4e4553fe5ccc58e2265eda1f883f08d3213b2a1..d835149189761be8bb12a2db9b6a1d11dfab7cc6 100644 (file)
--- a/docs/latex/wx/socksrv.tex
+++ b/docs/latex/wx/socksrv.tex
@@ -36,7 +36,7 @@
 
 Constructs a new server and tries to bind to the specified {\it address}.
 Before trying to accept new connections, test whether it succeeded with 
 
 Constructs a new server and tries to bind to the specified {\it address}.
 Before trying to accept new connections, test whether it succeeded with 

-\helpref{wxSocketBase::Ok}{wxsocketbaseok}.
+\helpref{wxSocketBase:IsOk}{wxsocketbaseisok}.

 
 \wxheading{Parameters}
 
 
 \wxheading{Parameters}
 

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index f0b8cb188364ac30f96190f0b9bff3e4797e712a..afafd319583b6681de9c27837bcd81fe2f0eb4f7 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -135,7 +135,8 @@ public:
     static void InitStandardHandlers();
     */
 
     static void InitStandardHandlers();
     */
 

-    virtual bool Ok() const = 0;
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const = 0;

 
     virtual int GetHeight() const = 0;
     virtual int GetWidth() const = 0;
 
     virtual int GetHeight() const = 0;
     virtual int GetWidth() const = 0;

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index f10801e67e46b63d037efb6afe1831a3b505c232..0b76205af72b1e0ccc26a13b71918ed1c681422b 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -179,7 +179,8 @@ public:
     int  GetOrientation() const { return m_printOrientation; }
 
     // Is this data OK for showing the print dialog?
     int  GetOrientation() const { return m_printOrientation; }
 
     // Is this data OK for showing the print dialog?

-    bool Ok() const ;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const ;

 
     const wxString& GetPrinterName() const { return m_printerName; }
     bool GetColour() const { return m_colour; }
 
     const wxString& GetPrinterName() const { return m_printerName; }
     bool GetColour() const { return m_colour; }


@@ -319,7 +320,8 @@ public:
     bool GetEnableHelp() const { return m_printEnableHelp; };
 
     // Is this data OK for showing the print dialog?
     bool GetEnableHelp() const { return m_printEnableHelp; };
 
     // Is this data OK for showing the print dialog?

-    bool Ok() const { return m_printData.Ok() ; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_printData.Ok() ; }

 
     wxPrintData& GetPrintData() { return m_printData; }
     void SetPrintData(const wxPrintData& printData) { m_printData = printData; }
 
     wxPrintData& GetPrintData() { return m_printData; }
     void SetPrintData(const wxPrintData& printData) { m_printData = printData; }


@@ -381,7 +383,8 @@ public:
     bool GetEnableHelp() const { return m_enableHelp; };
 
     // Is this data OK for showing the page setup dialog?
     bool GetEnableHelp() const { return m_enableHelp; };
 
     // Is this data OK for showing the page setup dialog?

-    bool Ok() const { return m_printData.Ok() ; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_printData.Ok() ; }

 
     // If a corresponding paper type is found in the paper database, will set the m_printData
     // paper size id member as well.
 
     // If a corresponding paper type is found in the paper database, will set the m_printData
     // paper size id member as well.

diff --git a/include/wx/cocoa/bitmap.h b/include/wx/cocoa/bitmap.h
index 4eccb2eb7c03fbefc6c67decc7efccac9488c88a..bcf18657525d1e7f5a6e6e9b4a93d4322b93c053 100644 (file)
--- a/include/wx/cocoa/bitmap.h
+++ b/include/wx/cocoa/bitmap.h
@@ -107,7 +107,8 @@ public:
     // get the given part of bitmap
     wxBitmap GetSubBitmap( const wxRect& rect ) const;
 
     // get the given part of bitmap
     wxBitmap GetSubBitmap( const wxRect& rect ) const;
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

     int GetWidth() const;
     int GetHeight() const;
     int GetDepth() const;
     int GetWidth() const;
     int GetHeight() const;
     int GetDepth() const;

diff --git a/include/wx/cocoa/brush.h b/include/wx/cocoa/brush.h
index a7639fc9989a571b60a113ffe197c750c353ea35..4bf3d8a71b8fa2e58ef27846717ee62b9fa96306 100644 (file)
--- a/include/wx/cocoa/brush.h
+++ b/include/wx/cocoa/brush.h
@@ -52,7 +52,8 @@ public:
     virtual int GetStyle() const;
     wxBitmap *GetStipple() const;
 
     virtual int GetStyle() const;
     wxBitmap *GetStipple() const;
 

-    virtual bool Ok() const
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const

     {   return (m_refData != NULL); }
 
     // wxObjectRefData
     {   return (m_refData != NULL); }
 
     // wxObjectRefData

diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h
index cfdcd373f3d350f48eb82f53d4efd4adf75ed882..c43b6e198e97d2104fca3b95de9b274b47c07e8b 100644 (file)
--- a/include/wx/cocoa/colour.h
+++ b/include/wx/cocoa/colour.h
@@ -40,7 +40,8 @@ public:
     virtual ~wxColour();
 
     // accessors
     virtual ~wxColour();
 
     // accessors

-    bool Ok() const { return m_cocoaNSColor; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_cocoaNSColor; }

     WX_NSColor GetNSColor() { return m_cocoaNSColor; }
 
     unsigned char Red() const { return m_red; }
     WX_NSColor GetNSColor() { return m_cocoaNSColor; }
 
     unsigned char Red() const { return m_red; }

diff --git a/include/wx/cocoa/cursor.h b/include/wx/cocoa/cursor.h
index d99375d26e89217668b99704d6060cf4557f77c5..fc59048635baf8c7509946157a04cddb902e9f90 100644 (file)
--- a/include/wx/cocoa/cursor.h
+++ b/include/wx/cocoa/cursor.h
@@ -49,7 +49,8 @@ public:
   wxCursor(int cursor_type);
   virtual ~wxCursor();
 
   wxCursor(int cursor_type);
   virtual ~wxCursor();
 

-  virtual bool Ok() const { return m_refData ; }
+  virtual bool Ok() const { return IsOk(); }
+  virtual bool IsOk() const { return m_refData ; }

 
   inline bool operator == (const wxCursor& cursor) const { return m_refData == cursor.m_refData; }
   inline bool operator != (const wxCursor& cursor) const { return m_refData != cursor.m_refData; }
 
   inline bool operator == (const wxCursor& cursor) const { return m_refData == cursor.m_refData; }
   inline bool operator != (const wxCursor& cursor) const { return m_refData != cursor.m_refData; }

diff --git a/include/wx/cocoa/icon.h b/include/wx/cocoa/icon.h
index f7bdd3b1c25fae5b3ef0c10613f336d85228b780..760692544e4b21610b0b042d97c6cd8cd139a92e 100644 (file)
--- a/include/wx/cocoa/icon.h
+++ b/include/wx/cocoa/icon.h
@@ -49,7 +49,8 @@ public:
     // ctors, assignment operators...), but it's ok to have such function
     void CopyFromBitmap(const wxBitmap& bmp);
 
     // ctors, assignment operators...), but it's ok to have such function
     void CopyFromBitmap(const wxBitmap& bmp);
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

     int GetWidth() const;
     int GetHeight() const;
 
     int GetWidth() const;
     int GetHeight() const;
 

diff --git a/include/wx/cocoa/pen.h b/include/wx/cocoa/pen.h
index 9f46d56becab1e87ac02ab739aad725b1d1d4084..6f14b7831829bf0e1e7948d2258e372e296cf547 100644 (file)
--- a/include/wx/cocoa/pen.h
+++ b/include/wx/cocoa/pen.h
@@ -39,7 +39,8 @@ public:
     inline bool operator != (const wxPen& pen) const
     {   return m_refData != pen.m_refData; }
 
     inline bool operator != (const wxPen& pen) const
     {   return m_refData != pen.m_refData; }
 

-    virtual bool Ok() const { return (m_refData != NULL) ; }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return (m_refData != NULL) ; }

 
     void SetColour(const wxColour& col) ;
     void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;
 
     void SetColour(const wxColour& col) ;
     void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;

diff --git a/include/wx/colour.h b/include/wx/colour.h
index 18101e11de5a21e09afba84d85629383c7f7d8f2..9c3cea2c90bb6559a2b2e888ec312b6ae89bf661 100644 (file)
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -94,7 +94,8 @@ public:
     // accessors
     // ---------
 
     // accessors
     // ---------
 

-    virtual bool Ok() const = 0;
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const = 0;

 
     virtual ChannelType Red() const = 0;
     virtual ChannelType Green() const = 0;
 
     virtual ChannelType Red() const = 0;
     virtual ChannelType Green() const = 0;

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 4ddb6a0e5adfd8ee8cb7624a3d94b5803a751ca5..0b74388dff1c080363918cb5cd398b78fa0d6112 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -497,7 +497,8 @@ public:
     // Resolution in Pixels per inch
     virtual wxSize GetPPI() const = 0;
 
     // Resolution in Pixels per inch
     virtual wxSize GetPPI() const = 0;
 

-    virtual bool Ok() const { return m_ok; }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return m_ok; }

 
     // accessors and setters
     // ---------------------
 
     // accessors and setters
     // ---------------------

diff --git a/include/wx/dcmirror.h b/include/wx/dcmirror.h
index 5c6cfaa7a0910dfafd46c3353482746d57df765f..0bcc54fc59174850cde9a1da5b9722b5b23f663c 100644 (file)
--- a/include/wx/dcmirror.h
+++ b/include/wx/dcmirror.h
@@ -53,7 +53,8 @@ public:
     virtual bool CanGetTextExtent() const { return m_dc.CanGetTextExtent(); }
     virtual int GetDepth() const { return m_dc.GetDepth(); }
     virtual wxSize GetPPI() const { return m_dc.GetPPI(); }
     virtual bool CanGetTextExtent() const { return m_dc.CanGetTextExtent(); }
     virtual int GetDepth() const { return m_dc.GetDepth(); }
     virtual wxSize GetPPI() const { return m_dc.GetPPI(); }

-    virtual bool Ok() const { return m_dc.Ok(); }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return m_dc.Ok(); }

     virtual void SetMapMode(int mode) { m_dc.SetMapMode(mode); }
     virtual void SetUserScale(double x, double y)
         { m_dc.SetUserScale(GetX(x, y), GetY(x, y)); }
     virtual void SetMapMode(int mode) { m_dc.SetMapMode(mode); }
     virtual void SetUserScale(double x, double y)
         { m_dc.SetUserScale(GetX(x, y), GetY(x, y)); }

diff --git a/include/wx/dfb/bitmap.h b/include/wx/dfb/bitmap.h
index 19767564f94c6377dfc9d457b65a36cff2f990c0..0bbda585bfc94447864a00d47f4bc7a7f9332f57 100644 (file)
--- a/include/wx/dfb/bitmap.h
+++ b/include/wx/dfb/bitmap.h
@@ -37,7 +37,8 @@ public:
     wxBitmap(const wxImage& image, int depth = -1);
 #endif
 
     wxBitmap(const wxImage& image, int depth = -1);
 #endif
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

     bool operator==(const wxBitmap& bmp) const;
     bool operator!=(const wxBitmap& bmp) const { return !(*this == bmp); }
 
     bool operator==(const wxBitmap& bmp) const;
     bool operator!=(const wxBitmap& bmp) const { return !(*this == bmp); }
 

diff --git a/include/wx/dfb/brush.h b/include/wx/dfb/brush.h
index 98791233990b7f9a242912ed2f35393f02c83b8b..c799da0eceef61e6bef1cfdc45e7ed816372f7dc 100644 (file)
--- a/include/wx/dfb/brush.h
+++ b/include/wx/dfb/brush.h
@@ -35,7 +35,8 @@ public:
     wxBrush(const wxColour &colour, int style = wxSOLID);
     wxBrush(const wxBitmap &stippleBitmap);
 
     wxBrush(const wxColour &colour, int style = wxSOLID);
     wxBrush(const wxBitmap &stippleBitmap);
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 

diff --git a/include/wx/dfb/cursor.h b/include/wx/dfb/cursor.h
index 298cbe0eb0395554218ef74c92ef22f82a4a7e11..7ebd2e81d768925edb6a78b3ac63756688369de3 100644 (file)
--- a/include/wx/dfb/cursor.h
+++ b/include/wx/dfb/cursor.h
@@ -32,7 +32,8 @@ public:
              long flags = wxBITMAP_TYPE_CUR_RESOURCE,
              int hotSpotX = 0, int hotSpotY = 0);
 
              long flags = wxBITMAP_TYPE_CUR_RESOURCE,
              int hotSpotX = 0, int hotSpotY = 0);
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

     bool operator==(const wxCursor& cursor) const;
     bool operator!=(const wxCursor& cursor) const { return !(*this == cursor); }
 
     bool operator==(const wxCursor& cursor) const;
     bool operator!=(const wxCursor& cursor) const { return !(*this == cursor); }
 

diff --git a/include/wx/dfb/pen.h b/include/wx/dfb/pen.h
index 3f78357ae87d0f031c000709f291ff6e98a31500..4565d943b15bf5768d5a8e15989113801957253d 100644 (file)
--- a/include/wx/dfb/pen.h
+++ b/include/wx/dfb/pen.h
@@ -57,7 +57,8 @@ public:
     wxDash* GetDash() const;
     wxBitmap *GetStipple() const;
 
     wxDash* GetDash() const;
     wxBitmap *GetStipple() const;
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
 protected:
     // ref counting code
 
 protected:
     // ref counting code

diff --git a/include/wx/font.h b/include/wx/font.h
index 8cb6a7e421abf57f18f5cf88f0725e2c02c60967..5d890e61765de4dcc791102ae8e9154cf150f029 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -157,7 +157,8 @@ public:
     static wxFont *New(const wxString& strNativeFontDesc);
 
     // was the font successfully created?
     static wxFont *New(const wxString& strNativeFontDesc);
 
     // was the font successfully created?

-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }

 
     // comparison
     bool operator == (const wxFont& font) const;
 
     // comparison
     bool operator == (const wxFont& font) const;

diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h
index 5bcdf830996df4dc5686c3649f1aaac7f2fcf109..17f7e44fa47de2a2cd482dcad455e53d49bff88c 100644 (file)
--- a/include/wx/generic/accel.h
+++ b/include/wx/generic/accel.h
@@ -30,7 +30,8 @@ public:
         { return !(*this == accel); }
 #endif
 
         { return !(*this == accel); }
 #endif
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     void Add(const wxAcceleratorEntry& entry);
     void Remove(const wxAcceleratorEntry& entry);
 
     void Add(const wxAcceleratorEntry& entry);
     void Remove(const wxAcceleratorEntry& entry);

diff --git a/include/wx/generic/colour.h b/include/wx/generic/colour.h
index 1f4f4ed5c1a9790410d80b60c04cb647996fbbae..28627daa0a0c372aea30da30f8a5a394c6a3fadb 100644 (file)
--- a/include/wx/generic/colour.h
+++ b/include/wx/generic/colour.h
@@ -33,7 +33,8 @@ public:
     virtual ~wxColour();
 
     // accessors
     virtual ~wxColour();
 
     // accessors

-    bool Ok() const { return m_isInit; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_isInit; }

 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index 4debcc07e2b4b330e98665c450df8072c35e7d65..65d2b2b32513b29c372969c66de12ad64f3242f4 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -45,7 +45,8 @@ public:
     // Recommended destructor :-)
     virtual ~wxPostScriptDC();
 
     // Recommended destructor :-)
     virtual ~wxPostScriptDC();
 

-  virtual bool Ok() const;
+  virtual bool Ok() const { return IsOk(); }
+  virtual bool IsOk() const;

 
   bool CanDrawBitmap() const { return true; }
 
 
   bool CanDrawBitmap() const { return true; }
 

diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h
index 8de3db902911d2e73d4946cd1cb31d27d332b132..63feb0a9d28a9a34a18a71ed7721c5076386e52d 100644 (file)
--- a/include/wx/generic/paletteg.h
+++ b/include/wx/generic/paletteg.h
@@ -35,7 +35,8 @@ public:
     virtual ~wxPalette();
     bool operator == ( const wxPalette& palette ) const;
     bool operator != ( const wxPalette& palette ) const;
     virtual ~wxPalette();
     bool operator == ( const wxPalette& palette ) const;
     bool operator != ( const wxPalette& palette ) const;

-    virtual bool Ok() const;
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const;

 
     bool Create( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
     int GetPixel( unsigned char red, unsigned char green, unsigned char blue ) const;
 
     bool Create( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
     int GetPixel( unsigned char red, unsigned char green, unsigned char blue ) const;

diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h
index d21d26c0dede22d2ba402c093e3ed85f1c54d9cd..41b4da8dd510478194583559c1d1699159d52ae9 100644 (file)
--- a/include/wx/generic/prntdlgg.h
+++ b/include/wx/generic/prntdlgg.h
@@ -86,7 +86,8 @@ public:
     virtual bool TransferTo( wxPrintData &data );
     virtual bool TransferFrom( const wxPrintData &data );
 
     virtual bool TransferTo( wxPrintData &data );
     virtual bool TransferFrom( const wxPrintData &data );
 

-    virtual bool Ok() const { return true; }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return true; }

 
     const wxString& GetPrinterCommand() const { return m_printerCommand; }
     const wxString& GetPrinterOptions() const { return m_printerOptions; }
 
     const wxString& GetPrinterCommand() const { return m_printerCommand; }
     const wxString& GetPrinterOptions() const { return m_printerOptions; }

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 13c0c5dffcd6d64ea30dc96c64ac002833a2da23..bb60fc43e60b1b3ae8d350c5dca4a524eabfd676 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -59,7 +59,8 @@ public:
     virtual ~wxBitmap();
     bool operator == ( const wxBitmap& bmp ) const;
     bool operator != ( const wxBitmap& bmp ) const { return !(*this == bmp); }
     virtual ~wxBitmap();
     bool operator == ( const wxBitmap& bmp ) const;
     bool operator != ( const wxBitmap& bmp ) const { return !(*this == bmp); }

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     bool Create(int width, int height, int depth = -1);
 
 
     bool Create(int width, int height, int depth = -1);
 

diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h
index 47ebc69caa31c8346ed069cc03ffcf64e35a2936..6d9a4104297dc07502b8269f68f4becfcb14d9d0 100644 (file)
--- a/include/wx/gtk/brush.h
+++ b/include/wx/gtk/brush.h
@@ -26,7 +26,8 @@ public:
     wxBrush( const wxBitmap &stippleBitmap );
     virtual ~wxBrush();
 
     wxBrush( const wxBitmap &stippleBitmap );
     virtual ~wxBrush();
 

-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }

 
     bool operator == ( const wxBrush& brush ) const;
     bool operator != (const wxBrush& brush) const { return !(*this == brush); }
 
     bool operator == ( const wxBrush& brush ) const;
     bool operator != (const wxBrush& brush) const { return !(*this == brush); }

diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h
index 25f0d58caf960d1689b1cfaf164ec4f3d156c7e2..01b49c45aafcbb58361c0d1f97d52ccdd54e3930 100644 (file)
--- a/include/wx/gtk/colour.h
+++ b/include/wx/gtk/colour.h
@@ -27,7 +27,8 @@ public:
 
     virtual ~wxColour();
 
 
     virtual ~wxColour();
 

-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }

 
     bool operator == ( const wxColour& col ) const;
     bool operator != ( const wxColour& col ) const { return !(*this == col); }
 
     bool operator == ( const wxColour& col ) const;
     bool operator != ( const wxColour& col ) const { return !(*this == col); }

diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h
index ef1a25272676ab0d6622a5a85eff42ff48e6448e..f4e0f4b71cd475c6da79ec447f4fbbc80eac9ace 100644 (file)
--- a/include/wx/gtk/cursor.h
+++ b/include/wx/gtk/cursor.h
@@ -34,7 +34,8 @@ public:
     virtual ~wxCursor();
     bool operator == ( const wxCursor& cursor ) const;
     bool operator != ( const wxCursor& cursor ) const;
     virtual ~wxCursor();
     bool operator == ( const wxCursor& cursor ) const;
     bool operator != ( const wxCursor& cursor ) const;

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     // implementation
 
 
     // implementation
 

diff --git a/include/wx/gtk/gnome/gprint.h b/include/wx/gtk/gnome/gprint.h
index 328d5ab2d39814f6ac4355fa68713e112b1b751b..280380270b158ff133d2484c5970d26ab83315e0 100644 (file)
--- a/include/wx/gtk/gnome/gprint.h
+++ b/include/wx/gtk/gnome/gprint.h
@@ -38,7 +38,8 @@ public:
     virtual bool TransferTo( wxPrintData &data );
     virtual bool TransferFrom( const wxPrintData &data );
 
     virtual bool TransferTo( wxPrintData &data );
     virtual bool TransferFrom( const wxPrintData &data );
 

-    virtual bool Ok() const { return true; }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return true; }

 
     GnomePrintConfig* GetPrintConfig() { return m_config; }
     void SetPrintJob( GnomePrintJob *job ) { m_job = job; }
 
     GnomePrintConfig* GetPrintConfig() { return m_config; }
     void SetPrintJob( GnomePrintJob *job ) { m_job = job; }


@@ -200,7 +201,8 @@ public:
     wxGnomePrintDC( wxGnomePrinter *printer );
     virtual ~wxGnomePrintDC();
 
     wxGnomePrintDC( wxGnomePrinter *printer );
     virtual ~wxGnomePrintDC();
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style=wxFLOOD_SURFACE );
     bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;
 
     bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style=wxFLOOD_SURFACE );
     bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;

diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h
index 44a80105e04e86101b955faaa18d56b65e97b6e7..b273d2c6df89a1e41ba1e57ff1311eb0c2fb20dd 100644 (file)
--- a/include/wx/gtk/pen.h
+++ b/include/wx/gtk/pen.h
@@ -27,7 +27,8 @@ public:
     wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
     virtual ~wxPen();
 
     wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
     virtual ~wxPen();
 

-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }

 
     bool operator == ( const wxPen& pen ) const;
     bool operator != (const wxPen& pen) const { return !(*this == pen); }
 
     bool operator == ( const wxPen& pen ) const;
     bool operator != (const wxPen& pen) const { return !(*this == pen); }

diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index db9f3549b2c11eff77936d05ae49268f9e36bc93..437771e18678e80e20c5e9a184ccc0c816a4bab5 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -73,7 +73,8 @@ public:
     virtual ~wxBitmap();
     bool operator == ( const wxBitmap& bmp ) const;
     bool operator != ( const wxBitmap& bmp ) const;
     virtual ~wxBitmap();
     bool operator == ( const wxBitmap& bmp ) const;
     bool operator != ( const wxBitmap& bmp ) const;

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     bool Create(int width, int height, int depth = -1);
 
 
     bool Create(int width, int height, int depth = -1);
 

diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h
index f6efa7c8b579b0c9e845a28a6494bba85a357e8e..51e1c7854854a3771190d9dbea04a386dd5b0329 100644 (file)
--- a/include/wx/gtk1/brush.h
+++ b/include/wx/gtk1/brush.h
@@ -36,7 +36,8 @@ public:
     wxBrush( const wxBitmap &stippleBitmap );
     virtual ~wxBrush();
 
     wxBrush( const wxBitmap &stippleBitmap );
     virtual ~wxBrush();
 

-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }

 
     bool operator == ( const wxBrush& brush ) const;
     bool operator != (const wxBrush& brush) const { return !(*this == brush); }
 
     bool operator == ( const wxBrush& brush ) const;
     bool operator != (const wxBrush& brush) const { return !(*this == brush); }

diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h
index cf91604445bc8aff4e90a8b91f382b52c6dd9364..c5006cf4fb73ba6963b8ffaf59419ddbde85bd35 100644 (file)
--- a/include/wx/gtk1/colour.h
+++ b/include/wx/gtk1/colour.h
@@ -45,7 +45,8 @@ public:
 
     virtual bool FromString(const wxChar *str);
 
 
     virtual bool FromString(const wxChar *str);
 

-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }

 
     bool operator == ( const wxColour& col ) const;
     bool operator != ( const wxColour& col ) const { return !(*this == col); }
 
     bool operator == ( const wxColour& col ) const;
     bool operator != ( const wxColour& col ) const { return !(*this == col); }

diff --git a/include/wx/gtk1/cursor.h b/include/wx/gtk1/cursor.h
index 71e36b2a53f76c0582623fcaaddaa36a214b009e..30969ed9efde8138355f4faef4eee1c3c66fc8f9 100644 (file)
--- a/include/wx/gtk1/cursor.h
+++ b/include/wx/gtk1/cursor.h
@@ -37,7 +37,8 @@ public:
     virtual ~wxCursor();
     bool operator == ( const wxCursor& cursor ) const;
     bool operator != ( const wxCursor& cursor ) const;
     virtual ~wxCursor();
     bool operator == ( const wxCursor& cursor ) const;
     bool operator != ( const wxCursor& cursor ) const;

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     // implementation
 
 
     // implementation
 

diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h
index dac2e0ff795623744cc370f9a9a6b5b26b68e458..91388c05a231f715d708df91fea9e140c4b1ab39 100644 (file)
--- a/include/wx/gtk1/pen.h
+++ b/include/wx/gtk1/pen.h
@@ -40,7 +40,8 @@ public:
     wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
     virtual ~wxPen();
 
     wxPen( const wxColour &colour, int width = 1, int style = wxSOLID );
     virtual ~wxPen();
 

-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }

 
     bool operator == ( const wxPen& pen ) const;
     bool operator != (const wxPen& pen) const { return !(*this == pen); }
 
     bool operator == ( const wxPen& pen ) const;
     bool operator != (const wxPen& pen) const { return !(*this == pen); }

diff --git a/include/wx/image.h b/include/wx/image.h
index 6e186e7d1cc57df04938efdd59ee1cd672edba2f..d1d4ec762162e10b674714ffb99036a6dbf6f97e 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -327,7 +327,8 @@ public:
     virtual bool SaveFile( wxOutputStream& stream, const wxString& mimetype ) const;
 #endif
 
     virtual bool SaveFile( wxOutputStream& stream, const wxString& mimetype ) const;
 #endif
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

     int GetWidth() const;
     int GetHeight() const;
 
     int GetWidth() const;
     int GetHeight() const;
 

diff --git a/include/wx/mac/carbon/accel.h b/include/wx/mac/carbon/accel.h
index e2b2e58b0a3b16b3c0a4cb11a994f76e558a94fc..742b460190671a96395dfb1157cbbe5892c4edad 100644 (file)
--- a/include/wx/mac/carbon/accel.h
+++ b/include/wx/mac/carbon/accel.h
@@ -29,7 +29,8 @@ public:
     bool operator != (const wxAcceleratorTable& accel) const
     { return m_refData != accel.m_refData; }
 
     bool operator != (const wxAcceleratorTable& accel) const
     { return m_refData != accel.m_refData; }
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     int GetCommand( wxKeyEvent &event );
 };
 
     int GetCommand( wxKeyEvent &event );
 };

diff --git a/include/wx/mac/carbon/bitmap.h b/include/wx/mac/carbon/bitmap.h
index a607ec3e9df72141f679bd1f35b3d74a0a8f1b1a..b2eb887ecdc72167d0bba87b16baea5305837d5f 100644 (file)
--- a/include/wx/mac/carbon/bitmap.h
+++ b/include/wx/mac/carbon/bitmap.h
@@ -132,7 +132,8 @@ public:
     // copies the contents and mask of the given (colour) icon to the bitmap
     virtual bool CopyFromIcon(const wxIcon& icon);
 
     // copies the contents and mask of the given (colour) icon to the bitmap
     virtual bool CopyFromIcon(const wxIcon& icon);
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

     int GetWidth() const;
     int GetHeight() const;
     int GetDepth() const;
     int GetWidth() const;
     int GetHeight() const;
     int GetDepth() const;

diff --git a/include/wx/mac/carbon/brush.h b/include/wx/mac/carbon/brush.h
index 24e9c68219411d175822e2a2bdef6a1d55ed86cc..349bde4603c2f445cd1b32df94e5d8f2fc8a27b0 100644 (file)
--- a/include/wx/mac/carbon/brush.h
+++ b/include/wx/mac/carbon/brush.h
@@ -57,7 +57,8 @@ public:
     virtual int GetStyle() const ;
     wxBitmap *GetStipple() const ;
 
     virtual int GetStyle() const ;
     wxBitmap *GetStipple() const ;
 

-    virtual bool Ok() const { return (m_refData != NULL) ; }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return (m_refData != NULL) ; }

 
 // Implementation
 
 
 // Implementation
 

diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h
index 54fb53afba96cda533e50d87241c8a9784094ce4..05fa12dc8fd9b539991f79ea9fad49a8dfa77abf 100644 (file)
--- a/include/wx/mac/carbon/colour.h
+++ b/include/wx/mac/carbon/colour.h
@@ -30,7 +30,8 @@ public:
     virtual ~wxColour();
 
     // accessors
     virtual ~wxColour();
 
     // accessors

-    bool Ok() const {return m_isInit; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const {return m_isInit; }

 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }

diff --git a/include/wx/mac/carbon/cursor.h b/include/wx/mac/carbon/cursor.h
index 33d8ef8cf5525eaa6a664994ea843d517479e0f9..097863c20d6d7a611cfd9624233a9bc28e3db2c7 100644 (file)
--- a/include/wx/mac/carbon/cursor.h
+++ b/include/wx/mac/carbon/cursor.h
@@ -35,7 +35,8 @@ public:
   virtual ~wxCursor();
 
        bool CreateFromXpm(const char **bits) ;
   virtual ~wxCursor();
 
        bool CreateFromXpm(const char **bits) ;

-  virtual bool Ok() const ;
+  virtual bool Ok() const { return IsOk(); }
+  virtual bool IsOk() const ;

 
   inline bool operator == (const wxCursor& cursor) const { return m_refData == cursor.m_refData; }
   inline bool operator != (const wxCursor& cursor) const { return m_refData != cursor.m_refData; }
 
   inline bool operator == (const wxCursor& cursor) const { return m_refData == cursor.m_refData; }
   inline bool operator != (const wxCursor& cursor) const { return m_refData != cursor.m_refData; }

diff --git a/include/wx/mac/carbon/icon.h b/include/wx/mac/carbon/icon.h
index 5a3b8d45cbe5f962492f97e479a49c290e543523..34fe306a7eb0c0771cfd5e74a82992adc485c800 100644 (file)
--- a/include/wx/mac/carbon/icon.h
+++ b/include/wx/mac/carbon/icon.h
@@ -44,7 +44,8 @@ public:
     // ctors, assignment operators...), but it's ok to have such function
     void CopyFromBitmap(const wxBitmap& bmp);
 
     // ctors, assignment operators...), but it's ok to have such function
     void CopyFromBitmap(const wxBitmap& bmp);
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

     int GetWidth() const;
     int GetHeight() const;
     int GetDepth() const;
     int GetWidth() const;
     int GetHeight() const;
     int GetDepth() const;

diff --git a/include/wx/mac/carbon/metafile.h b/include/wx/mac/carbon/metafile.h
index d959a386a90da1f3831b27e25fc493384180514f..e23f826746822f32dd1aaa66f536b6f4d5c25655 100644 (file)
--- a/include/wx/mac/carbon/metafile.h
+++ b/include/wx/mac/carbon/metafile.h
@@ -47,7 +47,8 @@ public:
     virtual bool SetClipboard(int width = 0, int height = 0);
 
     virtual bool Play(wxDC *dc);
     virtual bool SetClipboard(int width = 0, int height = 0);
 
     virtual bool Play(wxDC *dc);

-    bool Ok() const ;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const ;

 
     wxSize GetSize() const;
     int GetWidth() const { return GetSize().x; }
 
     wxSize GetSize() const;
     int GetWidth() const { return GetSize().x; }

diff --git a/include/wx/mac/carbon/palette.h b/include/wx/mac/carbon/palette.h
index b28de1c40b35d79a6ac82aaea044ed21a124edbb..538ca77eca89fe2d9ecf38afde6be96ec034ab8e 100644 (file)
--- a/include/wx/mac/carbon/palette.h
+++ b/include/wx/mac/carbon/palette.h
@@ -44,7 +44,8 @@ public:
     int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
     bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
 
     int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
     bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
 

-    virtual bool Ok() const { return (m_refData != NULL) ; }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return (m_refData != NULL) ; }

 
     inline bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
     inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }
 
     inline bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
     inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }

diff --git a/include/wx/mac/carbon/pen.h b/include/wx/mac/carbon/pen.h
index 5dde4b541d40ba90a2867e7be8dc16516aa614b4..607bf38622355c991996a605c2d960c440e9e5df 100644 (file)
--- a/include/wx/mac/carbon/pen.h
+++ b/include/wx/mac/carbon/pen.h
@@ -57,7 +57,8 @@ public:
   inline bool operator == (const wxPen& pen) const { return m_refData == pen.m_refData; }
   inline bool operator != (const wxPen& pen) const { return m_refData != pen.m_refData; }
 
   inline bool operator == (const wxPen& pen) const { return m_refData == pen.m_refData; }
   inline bool operator != (const wxPen& pen) const { return m_refData != pen.m_refData; }
 

-  virtual bool Ok() const { return (m_refData != NULL) ; }
+  virtual bool Ok() const { return IsOk(); }
+  virtual bool IsOk() const { return (m_refData != NULL) ; }

 
   // Override in order to recreate the pen
   void SetColour(const wxColour& col) ;
 
   // Override in order to recreate the pen
   void SetColour(const wxColour& col) ;

diff --git a/include/wx/mac/carbon/pngread.h b/include/wx/mac/carbon/pngread.h
index 3376a5fa81961275eb63730af672c3ce3ed00e6b..222a2c558921b571fa73582fb12a4334dfd993a5 100644 (file)
--- a/include/wx/mac/carbon/pngread.h
+++ b/include/wx/mac/carbon/pngread.h
@@ -88,7 +88,8 @@ public:
   virtual bool InstantiateBitmap(wxBitmap *bitmap);
   wxMask *CreateMask(void);
 
   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
 };
 
 class wxPNGReaderIter

diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index 75947c1baeac2bb3f5ddb4e41b9c6f318f373a78..5b0e068b39ddfa6c7f1490d2ffcefb8b94662645 100644 (file)
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -169,7 +169,8 @@ class wxMacDrawingHelper
 public:
     wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false );
     ~wxMacDrawingHelper();
 public:
     wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false );
     ~wxMacDrawingHelper();

-    bool Ok() { return m_ok; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() { return m_ok; }

     void LocalToWindow( Rect *rect) { OffsetRect( rect , m_origin.h , m_origin.v ); }
     void LocalToWindow( Point *pt ) { AddPt( m_origin , pt ); }
     void LocalToWindow( RgnHandle rgn ) { OffsetRgn( rgn , m_origin.h , m_origin.v ); }
     void LocalToWindow( Rect *rect) { OffsetRect( rect , m_origin.h , m_origin.v ); }
     void LocalToWindow( Point *pt ) { AddPt( m_origin , pt ); }
     void LocalToWindow( RgnHandle rgn ) { OffsetRgn( rgn , m_origin.h , m_origin.v ); }


@@ -486,7 +487,8 @@ public :
 
     virtual void Dispose();
 
 
     virtual void Dispose();
 

-    bool Ok() const { return GetControlRef() != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return GetControlRef() != NULL; }

 
     void SetReferenceInNativeControl();
     static wxMacControl* GetReferenceFromNativeControl(ControlRef control);
 
     void SetReferenceInNativeControl();
     static wxMacControl* GetReferenceFromNativeControl(ControlRef control);


@@ -1164,7 +1166,8 @@ public:
     virtual ~wxBitmapRefData();
 
     void Free();
     virtual ~wxBitmapRefData();
 
     void Free();

-    bool Ok() const { return m_ok; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_ok; }

     void SetOk( bool isOk) { m_ok = isOk; }
 
     void SetWidth( int width ) { m_width = width; }
     void SetOk( bool isOk) { m_ok = isOk; }
 
     void SetWidth( int width ) { m_width = width; }

diff --git a/include/wx/mac/classic/accel.h b/include/wx/mac/classic/accel.h
index e2b2e58b0a3b16b3c0a4cb11a994f76e558a94fc..742b460190671a96395dfb1157cbbe5892c4edad 100644 (file)
--- a/include/wx/mac/classic/accel.h
+++ b/include/wx/mac/classic/accel.h
@@ -29,7 +29,8 @@ public:
     bool operator != (const wxAcceleratorTable& accel) const
     { return m_refData != accel.m_refData; }
 
     bool operator != (const wxAcceleratorTable& accel) const
     { return m_refData != accel.m_refData; }
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     int GetCommand( wxKeyEvent &event );
 };
 
     int GetCommand( wxKeyEvent &event );
 };

diff --git a/include/wx/mac/classic/bitmap.h b/include/wx/mac/classic/bitmap.h
index c20a8a41bc9d3c3ec65bf2575c6ed552c6979dce..b3997a41221062f93a883da3219f556447f5101e 100644 (file)
--- a/include/wx/mac/classic/bitmap.h
+++ b/include/wx/mac/classic/bitmap.h
@@ -168,7 +168,8 @@ public:
   // copies the contents and mask of the given (colour) icon to the bitmap
   virtual bool CopyFromIcon(const wxIcon& icon);
 
   // copies the contents and mask of the given (colour) icon to the bitmap
   virtual bool CopyFromIcon(const wxIcon& icon);
 

-  bool Ok() const;
+  bool Ok() const { return IsOk(); }
+  bool IsOk() const;

   int GetWidth() const;
   int GetHeight() const;
   int GetDepth() const;
   int GetWidth() const;
   int GetHeight() const;
   int GetDepth() const;

diff --git a/include/wx/mac/classic/brush.h b/include/wx/mac/classic/brush.h
index 9f5ab8885c73a81e9aef34b412fbc5dfa197cd72..492953dce9270f63437e308b956f3888d2801153 100644 (file)
--- a/include/wx/mac/classic/brush.h
+++ b/include/wx/mac/classic/brush.h
@@ -57,7 +57,8 @@ public:
     virtual int GetStyle() const ;
     wxBitmap *GetStipple() const ;
 
     virtual int GetStyle() const ;
     wxBitmap *GetStipple() const ;
 

-    virtual bool Ok() const { return (m_refData != NULL) ; }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return (m_refData != NULL) ; }

 
 // Implementation
 
 
 // Implementation
 

diff --git a/include/wx/mac/classic/colour.h b/include/wx/mac/classic/colour.h
index 283941e72c9a415651ba1617fa6050604b3c539d..f010271fc64108505b1d3257cfcfbb533d922958 100644 (file)
--- a/include/wx/mac/classic/colour.h
+++ b/include/wx/mac/classic/colour.h
@@ -35,7 +35,8 @@ public:
     virtual ~wxColour();
 
     // accessors
     virtual ~wxColour();
 
     // accessors

-    bool Ok() const {return m_isInit; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const {return m_isInit; }

 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }

diff --git a/include/wx/mac/classic/cursor.h b/include/wx/mac/classic/cursor.h
index 2cd524a745276e9278b2dbdbaec087aa9e948e51..621a7aec0dd96226d35bced0eeeb3711107a894f 100644 (file)
--- a/include/wx/mac/classic/cursor.h
+++ b/include/wx/mac/classic/cursor.h
@@ -56,7 +56,8 @@ public:
   virtual ~wxCursor();
 
        bool CreateFromXpm(const char **bits) ;
   virtual ~wxCursor();
 
        bool CreateFromXpm(const char **bits) ;

-  virtual bool Ok() const { return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ; }
+  virtual bool Ok() const { return IsOk(); }
+  virtual bool IsOk() const { return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ; }

 
   inline bool operator == (const wxCursor& cursor) const { return m_refData == cursor.m_refData; }
   inline bool operator != (const wxCursor& cursor) const { return m_refData != cursor.m_refData; }
 
   inline bool operator == (const wxCursor& cursor) const { return m_refData == cursor.m_refData; }
   inline bool operator != (const wxCursor& cursor) const { return m_refData != cursor.m_refData; }

diff --git a/include/wx/mac/classic/metafile.h b/include/wx/mac/classic/metafile.h
index 4cd1f66ca8372c3b79f1fee9f21a2df785e6682e..b42deec6fa849b58e51776fe4ee426a30b4c1d33 100644 (file)
--- a/include/wx/mac/classic/metafile.h
+++ b/include/wx/mac/classic/metafile.h
@@ -58,7 +58,8 @@ public:
     virtual bool SetClipboard(int width = 0, int height = 0);
 
     virtual bool Play(wxDC *dc);
     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)); };

 
     wxSize GetSize() const;
     int GetWidth() const { return GetSize().x; }
 
     wxSize GetSize() const;
     int GetWidth() const { return GetSize().x; }

diff --git a/include/wx/mac/classic/palette.h b/include/wx/mac/classic/palette.h
index 8fbbf4ebfb69e16ee45c2aa122abd34c15092ea4..cfb756999426cf5416f5a2e97c911e523de351d8 100644 (file)
--- a/include/wx/mac/classic/palette.h
+++ b/include/wx/mac/classic/palette.h
@@ -45,7 +45,8 @@ public:
   int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
   bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
 
   int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
   bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
 

-  virtual bool Ok() const { return (m_refData != NULL) ; }
+  virtual bool Ok() const { return IsOk(); }
+  virtual bool IsOk() const { return (m_refData != NULL) ; }

 
   inline bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
   inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }
 
   inline bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
   inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }

diff --git a/include/wx/mac/classic/pen.h b/include/wx/mac/classic/pen.h
index 131cb24474a65406020b74bdfa7f4c6a365a60b8..cc6e3e6bb32e7a6098782d2b2a4ae625f5e4ef84 100644 (file)
--- a/include/wx/mac/classic/pen.h
+++ b/include/wx/mac/classic/pen.h
@@ -57,7 +57,8 @@ public:
   inline bool operator == (const wxPen& pen) const { return m_refData == pen.m_refData; }
   inline bool operator != (const wxPen& pen) const { return m_refData != pen.m_refData; }
 
   inline bool operator == (const wxPen& pen) const { return m_refData == pen.m_refData; }
   inline bool operator != (const wxPen& pen) const { return m_refData != pen.m_refData; }
 

-  virtual bool Ok() const { return (m_refData != NULL) ; }
+  virtual bool Ok() const { return IsOk(); }
+  virtual bool IsOk() const { return (m_refData != NULL) ; }

 
   // Override in order to recreate the pen
   void SetColour(const wxColour& col) ;
 
   // Override in order to recreate the pen
   void SetColour(const wxColour& col) ;

diff --git a/include/wx/mac/classic/pngread.h b/include/wx/mac/classic/pngread.h
index 3376a5fa81961275eb63730af672c3ce3ed00e6b..222a2c558921b571fa73582fb12a4334dfd993a5 100644 (file)
--- a/include/wx/mac/classic/pngread.h
+++ b/include/wx/mac/classic/pngread.h
@@ -88,7 +88,8 @@ public:
   virtual bool InstantiateBitmap(wxBitmap *bitmap);
   wxMask *CreateMask(void);
 
   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
 };
 
 class wxPNGReaderIter

diff --git a/include/wx/mac/classic/private.h b/include/wx/mac/classic/private.h
index d2c1c6986d834522e2d2a082465b4ee22c83fd1b..68a28a653f8e393837008d3b9edb1a479df68967 100644 (file)
--- a/include/wx/mac/classic/private.h
+++ b/include/wx/mac/classic/private.h
@@ -93,7 +93,8 @@ class wxMacDrawingHelper
 public:
     wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false ) ;
     ~wxMacDrawingHelper() ;
 public:
     wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false ) ;
     ~wxMacDrawingHelper() ;

-    bool Ok() { return m_ok ; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() { return m_ok ; }

     void LocalToWindow( Rect *rect) { OffsetRect( rect , m_origin.h , m_origin.v ) ; }
     void LocalToWindow( Point *pt ) { AddPt( m_origin , pt ) ; }
     void LocalToWindow( RgnHandle rgn ) { OffsetRgn( rgn , m_origin.h , m_origin.v ) ; }
     void LocalToWindow( Rect *rect) { OffsetRect( rect , m_origin.h , m_origin.v ) ; }
     void LocalToWindow( Point *pt ) { AddPt( m_origin , pt ) ; }
     void LocalToWindow( RgnHandle rgn ) { OffsetRgn( rgn , m_origin.h , m_origin.v ) ; }

diff --git a/include/wx/mgl/bitmap.h b/include/wx/mgl/bitmap.h
index 0f5b073554b77ff3d81948f23a3bebc7162f449a..25a58396b50b31fa0057805ece26904e0553859f 100644 (file)
--- a/include/wx/mgl/bitmap.h
+++ b/include/wx/mgl/bitmap.h
@@ -40,7 +40,8 @@ public:
     virtual ~wxBitmap() {}
     bool operator == (const wxBitmap& bmp) const;
     bool operator != (const wxBitmap& bmp) const;
     virtual ~wxBitmap() {}
     bool operator == (const wxBitmap& bmp) const;
     bool operator != (const wxBitmap& bmp) const;

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     bool Create(int width, int height, int depth = -1);
 
 
     bool Create(int width, int height, int depth = -1);
 

diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h
index 8208130df51533a05ee07b9240ccf706e115c005..1bbf1a538b115a150847bb56c2b06cc7555eeaf3 100644 (file)
--- a/include/wx/mgl/brush.h
+++ b/include/wx/mgl/brush.h
@@ -36,7 +36,8 @@ public:
     virtual ~wxBrush() {}
     bool operator == (const wxBrush& brush) const;
     bool operator != (const wxBrush& brush) const;
     virtual ~wxBrush() {}
     bool operator == (const wxBrush& brush) const;
     bool operator != (const wxBrush& brush) const;

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     virtual int GetStyle() const;
     wxColour &GetColour() const;
 
     virtual int GetStyle() const;
     wxColour &GetColour() const;

diff --git a/include/wx/mgl/cursor.h b/include/wx/mgl/cursor.h
index 5a0c378bacd0b52e83147cc293d2431db88fd948..9cbc07a306bbbacd8ab40927f8fb8f61f9bc8c52 100644 (file)
--- a/include/wx/mgl/cursor.h
+++ b/include/wx/mgl/cursor.h
@@ -35,7 +35,8 @@ public:
     virtual ~wxCursor();
     bool operator == (const wxCursor& cursor) const;
     bool operator != (const wxCursor& cursor) const;
     virtual ~wxCursor();
     bool operator == (const wxCursor& cursor) const;
     bool operator != (const wxCursor& cursor) const;

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     // implementation
     MGLCursor *GetMGLCursor() const;
 
     // implementation
     MGLCursor *GetMGLCursor() const;

diff --git a/include/wx/mgl/palette.h b/include/wx/mgl/palette.h
index 9d7574dd7cc1c67bbc3475bb8f48ad8e14384c0b..bc15c26da0fd4af91f777101e991f9ef74da178d 100644 (file)
--- a/include/wx/mgl/palette.h
+++ b/include/wx/mgl/palette.h
@@ -37,7 +37,8 @@ public:
     virtual ~wxPalette();
     bool operator == (const wxPalette& palette) const;
     bool operator != (const wxPalette& palette) const;
     virtual ~wxPalette();
     bool operator == (const wxPalette& palette) const;
     bool operator != (const wxPalette& palette) const;

-    virtual bool Ok() const;
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const;

 
     bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
     int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
 
     bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
     int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;

diff --git a/include/wx/mgl/pen.h b/include/wx/mgl/pen.h
index fefa2373c6f30ed17fcb838dd1b8012616116c2a..a18d97efb2a3f075b6a34465439e60f69a3be22f 100644 (file)
--- a/include/wx/mgl/pen.h
+++ b/include/wx/mgl/pen.h
@@ -56,7 +56,8 @@ public:
     wxDash* GetDash() const;
     wxBitmap *GetStipple() const;
 
     wxDash* GetDash() const;
     wxBitmap *GetStipple() const;
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     // implementation:
     void* GetPixPattern() const;
 
     // implementation:
     void* GetPixPattern() const;

diff --git a/include/wx/motif/accel.h b/include/wx/motif/accel.h
index 9cfde947d9743f124305ff3c399af9232421f5e3..3de7ce764078fd34df098585d1ef474a615abde0 100644 (file)
--- a/include/wx/motif/accel.h
+++ b/include/wx/motif/accel.h
@@ -29,7 +29,8 @@ public:
     bool operator == (const wxAcceleratorTable& accel) const { return m_refData == accel.m_refData; }
     bool operator != (const wxAcceleratorTable& accel) const { return m_refData != accel.m_refData; }
 
     bool operator == (const wxAcceleratorTable& accel) const { return m_refData == accel.m_refData; }
     bool operator != (const wxAcceleratorTable& accel) const { return m_refData != accel.m_refData; }
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     // Implementation only
     int GetCount() const;
 
     // Implementation only
     int GetCount() const;

diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h
index 522d7345c0807f472e87bf8b5ff44e5b940eaba0..3f628a90d69a011e5f3d1a53cfc7f53c58ec3411 100644 (file)
--- a/include/wx/motif/colour.h
+++ b/include/wx/motif/colour.h
@@ -36,7 +36,8 @@ public:
 
 
     // accessors
 
 
     // accessors

-    bool Ok() const {return m_isInit; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const {return m_isInit; }

     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
     unsigned char Blue() const { return m_blue; }
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
     unsigned char Blue() const { return m_blue; }

diff --git a/include/wx/motif/cursor.h b/include/wx/motif/cursor.h
index ed65bb52d961d3c7a52805388f4f0e591e9c2e46..11366cc4dfadfae6779084018e68229974623df2 100644 (file)
--- a/include/wx/motif/cursor.h
+++ b/include/wx/motif/cursor.h
@@ -39,7 +39,8 @@ public:
     wxCursor(wxStockCursor id);
     virtual ~wxCursor();
 
     wxCursor(wxStockCursor id);
     virtual ~wxCursor();
 

-    virtual bool Ok() const;
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const;

 
     bool operator == (const wxCursor& cursor) const
         { return m_refData == cursor.m_refData; }
 
     bool operator == (const wxCursor& cursor) const
         { return m_refData == cursor.m_refData; }

diff --git a/include/wx/motif/palette.h b/include/wx/motif/palette.h
index d4e00e6efb0f96c34239fe5d47e017160497adf2..4d4ae783725a53f9ad9dcff7db71a662f51b3042 100644 (file)
--- a/include/wx/motif/palette.h
+++ b/include/wx/motif/palette.h
@@ -58,7 +58,8 @@ public:
     int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
     bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
 
     int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
     bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
 

-    virtual bool Ok() const { return (m_refData != NULL) ; }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return (m_refData != NULL) ; }

 
     bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
     bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }
 
     bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
     bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }

diff --git a/include/wx/msw/accel.h b/include/wx/msw/accel.h
index d63a77c68c8eee62d2a57821af1bbdc3ecdcc6ed..f65d24664fa1d972c42c9b35d1e8ea0f98241493 100644 (file)
--- a/include/wx/msw/accel.h
+++ b/include/wx/msw/accel.h
@@ -34,7 +34,8 @@ public:
     bool operator!=(const wxAcceleratorTable& accel) const
         { return !(*this == accel); }
 
     bool operator!=(const wxAcceleratorTable& accel) const
         { return !(*this == accel); }
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

     void SetHACCEL(WXHACCEL hAccel);
     WXHACCEL GetHACCEL() const;
 
     void SetHACCEL(WXHACCEL hAccel);
     WXHACCEL GetHACCEL() const;
 

diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h
index 4a83d7b57d678626b81d518ad9ed3ac1d145dd32..3500cbf3b37c8cd70dd9535547d7a4c3505f9440 100644 (file)
--- a/include/wx/msw/brush.h
+++ b/include/wx/msw/brush.h
@@ -42,7 +42,8 @@ public:
     virtual int GetStyle() const;
     wxBitmap *GetStipple() const;
 
     virtual int GetStyle() const;
     wxBitmap *GetStipple() const;
 

-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }

 
     // return the HBRUSH for this brush
     virtual WXHANDLE GetResourceHandle() const;
 
     // return the HBRUSH for this brush
     virtual WXHANDLE GetResourceHandle() const;

diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index c2e259ef45a871d1b5baa658c86239ef0c9a81f3..0faf3d086e2792ae672266e030005f4ce1c8de4d 100644 (file)
--- a/include/wx/msw/colour.h
+++ b/include/wx/msw/colour.h
@@ -36,7 +36,8 @@ public:
     // accessors
     // ---------
 
     // accessors
     // ---------
 

-    bool Ok() const { return m_isInit; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_isInit; }

 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }

diff --git a/include/wx/msw/enhmeta.h b/include/wx/msw/enhmeta.h
index 1bfe8985c6abe8495a56a3d312d65c5de4e2991d..fa5389b1d00b8b7f3ebd92e221105a20070e8915 100644 (file)
--- a/include/wx/msw/enhmeta.h
+++ b/include/wx/msw/enhmeta.h
@@ -39,7 +39,8 @@ public:
     bool Play(wxDC *dc, wxRect *rectBound = (wxRect *)NULL);
 
     // accessors
     bool Play(wxDC *dc, wxRect *rectBound = (wxRect *)NULL);
 
     // accessors

-    bool Ok() const { return m_hMF != 0; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_hMF != 0; }

 
     wxSize GetSize() const;
     int GetWidth() const { return GetSize().x; }
 
     wxSize GetSize() const;
     int GetWidth() const { return GetSize().x; }

diff --git a/include/wx/msw/gdiimage.h b/include/wx/msw/gdiimage.h
index 8db767023a77e69b3d24e1358e583a945f755572..2111414a63e63ba96c0502bd72d93565b6645ddb 100644 (file)
--- a/include/wx/msw/gdiimage.h
+++ b/include/wx/msw/gdiimage.h
@@ -154,7 +154,8 @@ public:
     void SetHandle(WXHANDLE handle)
         { AllocExclusive(); GetGDIImageData()->m_handle = handle; }
 
     void SetHandle(WXHANDLE handle)
         { AllocExclusive(); GetGDIImageData()->m_handle = handle; }
 

-    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_width; }
     int GetHeight() const { return IsNull() ? 0 : GetGDIImageData()->m_height; }
 
     int GetWidth() const { return IsNull() ? 0 : GetGDIImageData()->m_width; }
     int GetHeight() const { return IsNull() ? 0 : GetGDIImageData()->m_height; }

diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h
index bac18903815a7a7fb041423558962d68851e2088..bbfc7c71a8c31e132a0aef5083f0a3b36002a1bf 100644 (file)
--- a/include/wx/msw/metafile.h
+++ b/include/wx/msw/metafile.h
@@ -51,7 +51,8 @@ public:
     virtual bool SetClipboard(int width = 0, int height = 0);
 
     virtual bool Play(wxDC *dc);
     virtual bool SetClipboard(int width = 0, int height = 0);
 
     virtual bool Play(wxDC *dc);

-    bool Ok() const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); };
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); };

 
     // set/get the size of metafile for clipboard operations
     wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); }
 
     // set/get the size of metafile for clipboard operations
     wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); }

diff --git a/include/wx/msw/ole/activex.h b/include/wx/msw/ole/activex.h
index 5635819639c10a4b2044d7204574df986d8ddb03..6f00084a0e17a261826c7edac12e9264ac784fe8 100644 (file)
--- a/include/wx/msw/ole/activex.h
+++ b/include/wx/msw/ole/activex.h
@@ -127,7 +127,8 @@ class wxAutoOleInterface \
     inline operator I *() const {return m_interface;}\
     inline I* operator ->() {return m_interface;}\
     inline I** GetRef()    {return &m_interface;}\
     inline operator I *() const {return m_interface;}\
     inline I* operator ->() {return m_interface;}\
     inline I** GetRef()    {return &m_interface;}\

-    inline bool Ok() const    {return m_interface != NULL;}\
+    inline bool Ok() const { return IsOk(); }
+    inline bool IsOk() const    {return m_interface != NULL;}\

 };
 
 WX_DECLARE_AUTOOLE(wxAutoIDispatch, IDispatch)
 };
 
 WX_DECLARE_AUTOOLE(wxAutoIDispatch, IDispatch)

diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h
index 35e5555fb30f6bf0998f9c233c82789869f393c3..f302fa3574dc7b27ed8ad0d6010c277572576182 100644 (file)
--- a/include/wx/msw/palette.h
+++ b/include/wx/msw/palette.h
@@ -41,7 +41,8 @@ public:
 
     virtual int GetColoursCount() const;
 
 
     virtual int GetColoursCount() 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& palette) const { return m_refData == palette.m_refData; }
     inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }
 
     inline bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
     inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }

diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h
index 7e682576d4249d9e8c83b41420d3030941cf1b24..57d5f1c0d6dff148acc84fb2de0791897d2a91db 100644 (file)
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -89,7 +89,8 @@ public:
 
     bool operator!=(const wxPen& pen) const { return !(*this == pen); }
 
 
     bool operator!=(const wxPen& pen) const { return !(*this == pen); }
 

-    virtual bool Ok() const { return (m_refData != NULL); }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return (m_refData != NULL); }

 
     // Override in order to recreate the pen
     void SetColour(const wxColour& col);
 
     // Override in order to recreate the pen
     void SetColour(const wxColour& col);

diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index d8510258662acb1c6c098b0e7c8b46912b74f00c..1e81317e25e313e5ba4dac1fb9278d08a915a058 100644 (file)
--- a/include/wx/msw/printdlg.h
+++ b/include/wx/msw/printdlg.h
@@ -34,7 +34,8 @@ public:
     virtual bool TransferTo( wxPrintData &data );
     virtual bool TransferFrom( const wxPrintData &data );
     
     virtual bool TransferTo( wxPrintData &data );
     virtual bool TransferFrom( const wxPrintData &data );
     

-    virtual bool Ok() const;
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const;

     
     void* GetDevMode() const { return m_devMode; }
     void SetDevMode(void* data) { m_devMode = data; }
     
     void* GetDevMode() const { return m_devMode; }
     void SetDevMode(void* data) { m_devMode = data; }

diff --git a/include/wx/os2/accel.h b/include/wx/os2/accel.h
index 0df2799ba8c170b30be293c471c84119f1b24ed8..a0ee7448b31e80cce869cc0a4295558d4535d8b4 100644 (file)
--- a/include/wx/os2/accel.h
+++ b/include/wx/os2/accel.h
@@ -45,7 +45,8 @@ public:
     inline bool operator!= (const wxAcceleratorTable& rAccel) const
     { return m_refData != rAccel.m_refData; };
 
     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;
 
     void SetHACCEL(WXHACCEL hAccel);
     WXHACCEL GetHACCEL(void) const;
 

diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h
index a072e4b82e6585a9fe6bbd9c81a71fff7c1e9c5a..f1d7be63e680a4a231d427c53d35789ca9ed7ce5 100644 (file)
--- a/include/wx/os2/brush.h
+++ b/include/wx/os2/brush.h
@@ -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 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
 
     //
     // Implementation

diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h
index 611a2e2512792e09ebb4a33440149ac7d4105dd9..f0538eab36e6d8025ddd9e9eceb49982d3c390cb 100644 (file)
--- a/include/wx/os2/colour.h
+++ b/include/wx/os2/colour.h
@@ -34,7 +34,8 @@ public:
     virtual ~wxColour();
 
     // Accessors
     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; }
 
     unsigned char Red(void) const { return m_cRed; }
     unsigned char Green(void) const { return m_cGreen; }

diff --git a/include/wx/os2/gdiimage.h b/include/wx/os2/gdiimage.h
index d2ffc8029410f8bddc55ab109985382404657ce3..b2f68d5ff027719ff316b7c20e78adf9ae57a633 100644 (file)
--- a/include/wx/os2/gdiimage.h
+++ b/include/wx/os2/gdiimage.h
@@ -187,7 +187,8 @@ public:
         pData->m_hHandle = hHandle;
     }
 
         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; }
 
     int GetWidth() const { return IsNull() ? 0 : GetGDIImageData()->m_nWidth; }
     int GetHeight() const { return IsNull() ? 0 : GetGDIImageData()->m_nHeight; }

diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h
index 82e4ef70c8d5dfe781a57596cf07dbd19a0b6870..41e256c552c30bc4b9e7c8b8001a19bd1a4ff8a0 100644 (file)
--- a/include/wx/os2/metafile.h
+++ b/include/wx/os2/metafile.h
@@ -58,7 +58,8 @@ public:
     virtual bool SetClipboard(int width = 0, int height = 0);
 
     virtual bool Play(wxDC *dc);
     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; }
 
     // Implementation
     inline WXHANDLE GetHMETAFILE(void) { return M_METAFILEDATA->m_metafile; }

diff --git a/include/wx/os2/palette.h b/include/wx/os2/palette.h
index a255f50665fca6797f6971c4dbf6b485fbe92217..e7312893fde4891a56626bb86b88f0c5880a3ab8 100644 (file)
--- a/include/wx/os2/palette.h
+++ b/include/wx/os2/palette.h
@@ -59,7 +59,8 @@ public:
                 ,unsigned char* pBlue
                ) const;
 
                 ,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; }
 
     inline bool       operator == (const wxPalette& rPalette) const
         { return m_refData == rPalette.m_refData; }

diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h
index 3594ffebec0f1cad7492a4bb024db81b65e85277..17c6822ac099c3fcfc0e3a8ef4a2851b5851b5ad 100644 (file)
--- a/include/wx/os2/pen.h
+++ b/include/wx/os2/pen.h
@@ -61,7 +61,8 @@ public:
     inline bool   operator != (const wxPen& rPen) const
         { return m_refData != rPen.m_refData; }
 
     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
 
     //
     // Override in order to recreate the pen

diff --git a/include/wx/os2/pngread.h b/include/wx/os2/pngread.h
index d4cf0361f1d5d2963ea6f765084dd4dc593eb4fd..5c46dc9eb7180929f7c98d9d3e61e1920393b4b3 100644 (file)
--- a/include/wx/os2/pngread.h
+++ b/include/wx/os2/pngread.h
@@ -88,7 +88,8 @@ public:
   virtual bool InstantiateBitmap(wxBitmap *bitmap);
   wxMask *CreateMask(void);
 
   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
 };
 
 class wxPNGReaderIter

diff --git a/include/wx/palette.h b/include/wx/palette.h
index 658c32f97697da8e78a918fa1f66e4eb50eb5fda..b04f513466f51ad1e2bd7f3e0070ec55f99ff845 100644 (file)
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -25,7 +25,8 @@ class WXDLLEXPORT wxPaletteBase: public wxGDIObject
 public:
     virtual ~wxPaletteBase() { }
 
 public:
     virtual ~wxPaletteBase() { }
 

-    virtual bool Ok() const = 0;
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const = 0;

     virtual int GetColoursCount() const { wxFAIL_MSG( _T("not implemented") ); return 0; }
 };
 
     virtual int GetColoursCount() const { wxFAIL_MSG( _T("not implemented") ); return 0; }
 };
 

diff --git a/include/wx/palmos/accel.h b/include/wx/palmos/accel.h
index e1970d25b79734bd7574baabffe057c18632d64e..5c9b415759645cbaaccb404b47ad2a87f8d4dc62 100644 (file)
--- a/include/wx/palmos/accel.h
+++ b/include/wx/palmos/accel.h
@@ -37,7 +37,8 @@ public:
         { return !(*this == accel); }
 #endif
 
         { return !(*this == accel); }
 #endif
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

     void SetHACCEL(WXHACCEL hAccel);
     WXHACCEL GetHACCEL() const;
 
     void SetHACCEL(WXHACCEL hAccel);
     WXHACCEL GetHACCEL() const;
 

diff --git a/include/wx/palmos/brush.h b/include/wx/palmos/brush.h
index 4e2cbbbb0fea3fc2f17b33281f27cd6226840597..4fce485d8e227b2d1f5bd6c68f470f89aa7cf4a8 100644 (file)
--- a/include/wx/palmos/brush.h
+++ b/include/wx/palmos/brush.h
@@ -42,7 +42,8 @@ public:
     virtual int GetStyle() const;
     wxBitmap *GetStipple() const;
 
     virtual int GetStyle() const;
     wxBitmap *GetStipple() const;
 

-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }

 
     // return the HBRUSH for this brush
     virtual WXHANDLE GetResourceHandle() const;
 
     // return the HBRUSH for this brush
     virtual WXHANDLE GetResourceHandle() const;

diff --git a/include/wx/palmos/enhmeta.h b/include/wx/palmos/enhmeta.h
index 9a48c25109b06c7766f725cb51dbd08d597bf4e6..c7cd75147729567f205e26c33cdf3b255875a0db 100644 (file)
--- a/include/wx/palmos/enhmeta.h
+++ b/include/wx/palmos/enhmeta.h
@@ -39,7 +39,8 @@ public:
     bool Play(wxDC *dc, wxRect *rectBound = (wxRect *)NULL);
 
     // accessors
     bool Play(wxDC *dc, wxRect *rectBound = (wxRect *)NULL);
 
     // accessors

-    bool Ok() const { return m_hMF != 0; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_hMF != 0; }

 
     wxSize GetSize() const;
     int GetWidth() const { return GetSize().x; }
 
     wxSize GetSize() const;
     int GetWidth() const { return GetSize().x; }

diff --git a/include/wx/palmos/gdiimage.h b/include/wx/palmos/gdiimage.h
index b954e2a331e6cc14672ea08c8f48b19698737d0e..edaa3553f5c27fa16e783ad43336d3a8e79f23e3 100644 (file)
--- a/include/wx/palmos/gdiimage.h
+++ b/include/wx/palmos/gdiimage.h
@@ -147,7 +147,8 @@ public:
     void SetHandle(WXHANDLE handle)
         { EnsureHasData(); GetGDIImageData()->m_handle = handle; }
 
     void SetHandle(WXHANDLE handle)
         { EnsureHasData(); GetGDIImageData()->m_handle = handle; }
 

-    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_width; }
     int GetHeight() const { return IsNull() ? 0 : GetGDIImageData()->m_height; }
 
     int GetWidth() const { return IsNull() ? 0 : GetGDIImageData()->m_width; }
     int GetHeight() const { return IsNull() ? 0 : GetGDIImageData()->m_height; }

diff --git a/include/wx/palmos/metafile.h b/include/wx/palmos/metafile.h
index 14c623979f869712ca2e3eac2ae737cf354c803d..82ab410b5b40f2a0131fc048d6fda61225b95180 100644 (file)
--- a/include/wx/palmos/metafile.h
+++ b/include/wx/palmos/metafile.h
@@ -51,7 +51,8 @@ public:
     virtual bool SetClipboard(int width = 0, int height = 0);
 
     virtual bool Play(wxDC *dc);
     virtual bool SetClipboard(int width = 0, int height = 0);
 
     virtual bool Play(wxDC *dc);

-    bool Ok() const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); };
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); };

 
     // set/get the size of metafile for clipboard operations
     wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); }
 
     // set/get the size of metafile for clipboard operations
     wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); }

diff --git a/include/wx/palmos/palette.h b/include/wx/palmos/palette.h
index 03678ac15d789849e68afb63606cffc75f363a7f..0229985a7a774bc698bc1f9945a617193a6de7cc 100644 (file)
--- a/include/wx/palmos/palette.h
+++ b/include/wx/palmos/palette.h
@@ -41,7 +41,8 @@ public:
   int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
   bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
 
   int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
   bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) 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& palette) const { return m_refData == palette.m_refData; }
   inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }
 
   inline bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
   inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }

diff --git a/include/wx/palmos/pen.h b/include/wx/palmos/pen.h
index 6c86bb8e9b3a35494d088efc117f948ce1112f08..fb190c5a4a8c180348d7e2e8ddc0a3ddc9637e98 100644 (file)
--- a/include/wx/palmos/pen.h
+++ b/include/wx/palmos/pen.h
@@ -89,7 +89,8 @@ public:
 
     bool operator!=(const wxPen& pen) const { return !(*this == pen); }
 
 
     bool operator!=(const wxPen& pen) const { return !(*this == pen); }
 

-    virtual bool Ok() const { return (m_refData != NULL); }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return (m_refData != NULL); }

 
     // Override in order to recreate the pen
     void SetColour(const wxColour& col);
 
     // Override in order to recreate the pen
     void SetColour(const wxColour& col);

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index 73a5d466757acec105d3a3463d27657b76b431e4..eba4f57fa457bdfe1924896b5699fc18d8ad84d4 100644 (file)
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -143,7 +143,8 @@ public:
     virtual bool TransferTo( wxPrintData &data ) = 0;
     virtual bool TransferFrom( const wxPrintData &data ) = 0;
 
     virtual bool TransferTo( wxPrintData &data ) = 0;
     virtual bool TransferFrom( const wxPrintData &data ) = 0;
 

-    virtual bool Ok() const = 0;
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const = 0;

 
     int  m_ref;
 
 
     int  m_ref;
 


@@ -495,7 +496,8 @@ public:
     virtual int GetMaxPage() const;
     virtual int GetMinPage() const;
 
     virtual int GetMaxPage() const;
     virtual int GetMinPage() const;
 

-    virtual bool Ok() const;
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const;

     virtual void SetOk(bool ok);
 
     ///////////////////////////////////////////////////////////////////////////
     virtual void SetOk(bool ok);
 
     ///////////////////////////////////////////////////////////////////////////


@@ -578,7 +580,8 @@ public:
     virtual int GetMaxPage() const;
     virtual int GetMinPage() const;
 
     virtual int GetMaxPage() const;
     virtual int GetMinPage() const;
 

-    virtual bool Ok() const;
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const;

     virtual void SetOk(bool ok);
 
 private:
     virtual void SetOk(bool ok);
 
 private:

diff --git a/include/wx/region.h b/include/wx/region.h
index a4d68ec2aea9897e1cfb99f54dbda28ae864b6bd..b0a6c47bdd58358c66703e74e2e5fe15294783f0 100644 (file)
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -82,7 +82,8 @@ public:
     // accessors
     // ---------
 
     // accessors
     // ---------
 

-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }

 
     // Is region empty?
     virtual bool IsEmpty() const = 0;
 
     // Is region empty?
     virtual bool IsEmpty() const = 0;

diff --git a/include/wx/richtext/richtextbuffer.h b/include/wx/richtext/richtextbuffer.h
index 2ccc6ac95726d3a65d9892041088278729563d5e..a2c3fb982c1716c0bc27039d302b39646866ff7a 100644 (file)
--- a/include/wx/richtext/richtextbuffer.h
+++ b/include/wx/richtext/richtextbuffer.h
@@ -1340,7 +1340,8 @@ public:
     void SetDataSize(size_t size) { m_dataSize = size; }
     void SetImageType(int imageType) { m_imageType = imageType; }
 
     void SetDataSize(size_t size) { m_dataSize = size; }
     void SetImageType(int imageType) { m_imageType = imageType; }
 

-    bool Ok() const { return GetData() != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return GetData() != NULL; }

 
 /// Implementation
 
 
 /// Implementation
 

diff --git a/include/wx/socket.h b/include/wx/socket.h
index 401768641e9cc0faa5a033f75ab7ed0758277a35..ee2578f3c213ff08ca2901e1c37fae0a70ffa450 100644 (file)
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -108,7 +108,8 @@ public:
   bool Destroy();
 
   // state
   bool Destroy();
 
   // state

-  inline bool Ok() const { return (m_socket != NULL); };
+  inline bool Ok() const { return IsOk(); }
+  inline bool IsOk() const { return (m_socket != NULL); };

   inline bool Error() const { return m_error; };
   inline bool IsConnected() const { return m_connected; };
   inline bool IsData() { return WaitForRead(0, 0); };
   inline bool Error() const { return m_error; };
   inline bool IsConnected() const { return m_connected; };
   inline bool IsData() { return WaitForRead(0, 0); };

diff --git a/include/wx/stream.h b/include/wx/stream.h
index ca3b84eb57ebee606bc297bfab7f9cfb4199697a..c26638a68b792b0ce376483592496af17981f34b 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -266,7 +266,8 @@ public:
     wxCountingOutputStream();
 
     wxFileOffset GetLength() const;
     wxCountingOutputStream();
 
     wxFileOffset GetLength() const;

-    bool Ok() const { return true; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return true; }

 
 protected:
     virtual size_t OnSysWrite(const void *buffer, size_t size);
 
 protected:
     virtual size_t OnSysWrite(const void *buffer, size_t size);

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index 1d2a54ce582451bed439c042be1b3662b4162355..79feb44fe4e09e4c1cae8d00bf6c380f39454fe5 100644 (file)
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -38,7 +38,8 @@ public:
 
     wxFileOffset GetLength() const;
 
 
     wxFileOffset GetLength() const;
 

-    bool Ok() const { return m_file->IsOpened(); }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_file->IsOpened(); }

     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:


@@ -67,7 +68,8 @@ public:
     bool Close() { return m_file_destroy ? m_file->Close() : true; }
     wxFileOffset GetLength() const;
 
     bool Close() { return m_file_destroy ? m_file->Close() : true; }
     wxFileOffset GetLength() const;
 

-    bool Ok() const { return m_file->IsOpened(); }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_file->IsOpened(); }

     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:


@@ -137,7 +139,8 @@ public:
 
     wxFileOffset GetLength() const;
 
 
     wxFileOffset GetLength() const;
 

-    bool Ok() const { return m_file->IsOpened(); }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_file->IsOpened(); }

     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:


@@ -166,7 +169,8 @@ public:
     bool Close() { return m_file_destroy ? m_file->Close() : true; }
     wxFileOffset GetLength() const;
 
     bool Close() { return m_file_destroy ? m_file->Close() : true; }
     wxFileOffset GetLength() const;
 

-    bool Ok() const { return m_file->IsOpened(); }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_file->IsOpened(); }

     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:

diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h
index 9f104b2b00cf0ce0aa38451de14dc19457930427..8ad40183ff89c38983bb6ace32dbaaa3daa21bfb 100644 (file)
--- a/include/wx/x11/bitmap.h
+++ b/include/wx/x11/bitmap.h
@@ -79,7 +79,8 @@ public:
 
     bool operator == ( const wxBitmap& bmp ) const;
     bool operator != ( const wxBitmap& bmp ) const;
 
     bool operator == ( const wxBitmap& bmp ) const;
     bool operator != ( const wxBitmap& bmp ) const;

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     static void InitStandardHandlers();
 
 
     static void InitStandardHandlers();
 

diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h
index 47581c103496a5b14d4987f02034483c722703c7..c261ba205ac91eb04db0d59320536441eda488c2 100644 (file)
--- a/include/wx/x11/brush.h
+++ b/include/wx/x11/brush.h
@@ -35,7 +35,8 @@ public:
     wxBrush( const wxBitmap &stippleBitmap );
     virtual ~wxBrush();
 
     wxBrush( const wxBitmap &stippleBitmap );
     virtual ~wxBrush();
 

-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }

 
     bool operator == ( const wxBrush& brush ) const;
     bool operator != (const wxBrush& brush) const { return !(*this == brush); }
 
     bool operator == ( const wxBrush& brush ) const;
     bool operator != (const wxBrush& brush) const { return !(*this == brush); }

diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h
index 17c4f534c0671ec589daf3ff52244b1f2a7f16d8..101055920a921206700644142c927e2d13a960a7 100644 (file)
--- a/include/wx/x11/colour.h
+++ b/include/wx/x11/colour.h
@@ -44,7 +44,8 @@ public:
 
     virtual ~wxColour();
 
 
     virtual ~wxColour();
 

-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }

 
     bool operator == ( const wxColour& col ) const;
     bool operator != ( const wxColour& col ) const { return !(*this == col); }
 
     bool operator == ( const wxColour& col ) const;
     bool operator != ( const wxColour& col ) const { return !(*this == col); }

diff --git a/include/wx/x11/cursor.h b/include/wx/x11/cursor.h
index bdb7b8ca7b1ff41f4d6dcdf12227b29e29b3ca14..1fe2ff2955a5efe1ecb328a9716f8a0bf087ca32 100644 (file)
--- a/include/wx/x11/cursor.h
+++ b/include/wx/x11/cursor.h
@@ -37,7 +37,8 @@ public:
     virtual ~wxCursor();
     bool operator == ( const wxCursor& cursor ) const;
     bool operator != ( const wxCursor& cursor ) const;
     virtual ~wxCursor();
     bool operator == ( const wxCursor& cursor ) const;
     bool operator != ( const wxCursor& cursor ) const;

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     // implementation
 
 
     // implementation
 

diff --git a/include/wx/x11/palette.h b/include/wx/x11/palette.h
index f427ec3e23d9fe73341bf727de1abfd76410375d..8375bbd624aaba25b4984aec972f1d5af8901dc8 100644 (file)
--- a/include/wx/x11/palette.h
+++ b/include/wx/x11/palette.h
@@ -58,7 +58,8 @@ public:
     int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
     bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
 
     int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
     bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
 

-    virtual bool Ok() const { return (m_refData != NULL) ; }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return (m_refData != NULL) ; }

 
     bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
     bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }
 
     bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
     bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }

diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h
index eeff1b0756a134e8527fe2b8477d67ae00238137..7df09ebc19f27875596e4d0effc7d14a16967d76 100644 (file)
--- a/include/wx/x11/pen.h
+++ b/include/wx/x11/pen.h
@@ -38,7 +38,8 @@ public:
     wxPen( const wxBitmap &stipple, int width );
     virtual ~wxPen();
 
     wxPen( const wxBitmap &stipple, int width );
     virtual ~wxPen();
 

-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }

 
     bool operator == ( const wxPen& pen ) const;
     bool operator != (const wxPen& pen) const { return !(*this == pen); }
 
     bool operator == ( const wxPen& pen ) const;
     bool operator != (const wxPen& pen) const { return !(*this == pen); }

diff --git a/src/cocoa/bitmap.mm b/src/cocoa/bitmap.mm
index 08f4af5204b6bb2394d3dbfab891a856e5be2fc7..452a92cbeedf9564a0464c5f915f4fef049794ed 100644 (file)
--- a/src/cocoa/bitmap.mm
+++ b/src/cocoa/bitmap.mm
@@ -244,7 +244,7 @@ void wxBitmap::SetMask(wxMask *mask)
     M_BITMAPDATA->m_bitmapMask = mask ;
 }
 
     M_BITMAPDATA->m_bitmapMask = mask ;
 }
 

-bool wxBitmap::Ok() const
+bool wxBitmap::IsOk() const

 {
     return m_refData && M_BITMAPDATA->m_ok;
 }
 {
     return m_refData && M_BITMAPDATA->m_ok;
 }

diff --git a/src/cocoa/icon.mm b/src/cocoa/icon.mm
index 9c5e15c9509632f5db293c935adb06dee4d1628d..09924c8cb7cc16bc3518d843310101e8a29fcb2e 100644 (file)
--- a/src/cocoa/icon.mm
+++ b/src/cocoa/icon.mm
@@ -134,7 +134,7 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bitmap)
     M_ICONDATA->m_quality = 0;
 }
 
     M_ICONDATA->m_quality = 0;
 }
 

-bool wxIcon::Ok() const
+bool wxIcon::IsOk() const

 {
     return m_refData && M_ICONDATA->m_ok;
 }
 {
     return m_refData && M_ICONDATA->m_ok;
 }

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 13b30b55798d482d795a631b356aa0b7e942fdfa..a60068a9eef89dc77e365aa42d797ef32be8037b 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -252,7 +252,7 @@ void wxPrintData::operator=(const wxPrintData& data)
 }
 
 // Is this data OK for showing the print dialog?
 }
 
 // Is this data OK for showing the print dialog?

-bool wxPrintData::Ok() const
+bool wxPrintData::IsOk() const

 {
     m_nativeData->TransferFrom( *this );
 
 {
     m_nativeData->TransferFrom( *this );
 

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index 9cf6d614f9a3dd2084d5204df4b5499179be0c1c..c2e8e6599f6b4895dc69a940771a8dfe529d35ec 100644 (file)
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -1114,7 +1114,7 @@ bool wxICOHandler::SaveFile(wxImage *image,
         }
         wxUint32 Size = cStream.GetSize();
 
         }
         wxUint32 Size = cStream.GetSize();
 

-        // wxCountingOutputStream::Ok() always returns true for now and this
+        // wxCountingOutputStream::IsOk() always returns true for now and this

         // "if" provokes VC++ warnings in optimized build
 #if 0
         if ( !cStream.Ok() )
         // "if" provokes VC++ warnings in optimized build
 #if 0
         if ( !cStream.Ok() )

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 97f42c347e1d30e607a03bf6fa2dd1ad80db00ab..4c0464d3cb71641485f3506a40c3e01b1bd619d4 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -1544,7 +1544,7 @@ unsigned char wxImage::GetBlue( int x, int y ) const
     return M_IMGDATA->m_data[pos+2];
 }
 
     return M_IMGDATA->m_data[pos+2];
 }
 

-bool wxImage::Ok() const
+bool wxImage::IsOk() const

 {
     // image of 0 width or height can't be considered ok - at least because it
     // causes crashes in ConvertToBitmap() if we don't catch it in time
 {
     // image of 0 width or height can't be considered ok - at least because it
     // causes crashes in ConvertToBitmap() if we don't catch it in time

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index a06698ac58686a2f254858b0a176bbcd6b34c295..9bb2f18a2fe38f64c415a8e5de2bbcc3981ea239 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -1371,7 +1371,7 @@ int wxPrintPreviewBase::GetMaxPage() const
 { return m_maxPage; }
 int wxPrintPreviewBase::GetMinPage() const
 { return m_minPage; }
 { return m_maxPage; }
 int wxPrintPreviewBase::GetMinPage() const
 { return m_minPage; }

-bool wxPrintPreviewBase::Ok() const
+bool wxPrintPreviewBase::IsOk() const

 { return m_isOk; }
 void wxPrintPreviewBase::SetOk(bool ok)
 { m_isOk = ok; }
 { return m_isOk; }
 void wxPrintPreviewBase::SetOk(bool ok)
 { m_isOk = ok; }


@@ -1499,7 +1499,7 @@ int wxPrintPreview::GetMinPage() const
     return m_pimpl->GetMinPage();
 }
 
     return m_pimpl->GetMinPage();
 }
 

-bool wxPrintPreview::Ok() const
+bool wxPrintPreview::IsOk() const

 {
     return m_pimpl->Ok();
 }
 {
     return m_pimpl->Ok();
 }

diff --git a/src/dfb/bitmap.cpp b/src/dfb/bitmap.cpp
index 1f65aacad0f1d8b8dc9340fa6239ee1082aabd56..59d158d517ffe37f9810da77b325ffa0c3db64f4 100644 (file)
--- a/src/dfb/bitmap.cpp
+++ b/src/dfb/bitmap.cpp
@@ -189,7 +189,7 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
     wxFAIL_MSG( _T("not implemented") );
 }
 
     wxFAIL_MSG( _T("not implemented") );
 }
 

-bool wxBitmap::Ok() const
+bool wxBitmap::IsOk() const

 {
     return (m_refData != NULL && M_BITMAP->m_surface);
 }
 {
     return (m_refData != NULL && M_BITMAP->m_surface);
 }

diff --git a/src/dfb/brush.cpp b/src/dfb/brush.cpp
index f3d4f8c78cb80fb198c6adf63f4d9355eb353e05..475491621ffb338eecf7da9be1586393a7f64b97 100644 (file)
--- a/src/dfb/brush.cpp
+++ b/src/dfb/brush.cpp
@@ -80,7 +80,7 @@ bool wxBrush::operator==(const wxBrush& brush) const
     return m_refData == brush.m_refData;
 }
 
     return m_refData == brush.m_refData;
 }
 

-bool wxBrush::Ok() const
+bool wxBrush::IsOk() const

 {
     return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
 }
 {
     return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
 }

diff --git a/src/dfb/cursor.cpp b/src/dfb/cursor.cpp
index 58417b3d3b9ae9266011c130ff4ba703a10c5f7c..5f4ea9114b356b424e6a74f4cff72891ddc1286e 100644 (file)
--- a/src/dfb/cursor.cpp
+++ b/src/dfb/cursor.cpp
@@ -63,7 +63,7 @@ wxCursor::wxCursor(const wxString& cursor_file,
 #warning "FIXME"
 }
 
 #warning "FIXME"
 }
 

-bool wxCursor::Ok() const
+bool wxCursor::IsOk() const

 {
     return m_refData && M_CURSOR->m_bitmap.Ok();
 }
 {
     return m_refData && M_CURSOR->m_bitmap.Ok();
 }

diff --git a/src/dfb/pen.cpp b/src/dfb/pen.cpp
index d72740cdc8231be939452e28d97ce8e2d6eebf38..e2f1079d0a00af230fa589fae0c89ecce89a623b 100644 (file)
--- a/src/dfb/pen.cpp
+++ b/src/dfb/pen.cpp
@@ -189,7 +189,7 @@ wxBitmap *wxPen::GetStipple() const
     return NULL;
 }
 
     return NULL;
 }
 

-bool wxPen::Ok() const
+bool wxPen::IsOk() const

 {
     return ((m_refData) && M_PENDATA->m_colour.Ok());
 }
 {
     return ((m_refData) && M_PENDATA->m_colour.Ok());
 }

diff --git a/src/generic/accel.cpp b/src/generic/accel.cpp
index b6ae238a7581503ac67fdf99aff06055a238dcf9..91c39cd06681c1879f7d88e65e920c5911f6abe6 100644 (file)
--- a/src/generic/accel.cpp
+++ b/src/generic/accel.cpp
@@ -107,7 +107,7 @@ wxAcceleratorTable::~wxAcceleratorTable()
 {
 }
 
 {
 }
 

-bool wxAcceleratorTable::Ok() const
+bool wxAcceleratorTable::IsOk() const

 {
     return m_refData != NULL;
 }
 {
     return m_refData != NULL;
 }

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index ac6438b1471486db65c26d14c2ee0ecd90783ae6..177330a25cfa6c998585328ce9a0d1281777781d 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -304,7 +304,7 @@ wxPostScriptDC::~wxPostScriptDC ()
     }
 }
 
     }
 }
 

-bool wxPostScriptDC::Ok() const
+bool wxPostScriptDC::IsOk() const

 {
   return m_ok;
 }
 {
   return m_ok;
 }

diff --git a/src/generic/paletteg.cpp b/src/generic/paletteg.cpp
index 87945ca2743d9ebfbdd515189648df8c3312bd35..5d21a8b33053323b28022043405d9622055e921f 100644 (file)
--- a/src/generic/paletteg.cpp
+++ b/src/generic/paletteg.cpp
@@ -80,7 +80,7 @@ bool wxPalette::operator != (const wxPalette& palette) const
     return m_refData != palette.m_refData;
 }
 
     return m_refData != palette.m_refData;
 }
 

-bool wxPalette::Ok() const
+bool wxPalette::IsOk() const

 {
     return (m_refData != NULL);
 }
 {
     return (m_refData != NULL);
 }

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 019d6cd213a51c98dff0d2324719162f92829203..1d9e3f82bd3d2d250dd002009f0b31d0ccbb1ec3 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -713,7 +713,7 @@ bool wxBitmap::operator == ( const wxBitmap& bmp ) const
     return m_refData == bmp.m_refData;
 }
 
     return m_refData == bmp.m_refData;
 }
 

-bool wxBitmap::Ok() const
+bool wxBitmap::IsOk() const

 {
     return (m_refData != NULL) &&
            (
 {
     return (m_refData != NULL) &&
            (

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index a175daaa6ee5030a68419963b66fe369057b30d4..26b1bc06295b99b71bf985de13018df7fdb8633a 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -320,7 +320,7 @@ bool wxCursor::operator != ( const wxCursor& cursor ) const
     return m_refData != cursor.m_refData;
 }
 
     return m_refData != cursor.m_refData;
 }
 

-bool wxCursor::Ok() const
+bool wxCursor::IsOk() const

 {
     return (m_refData != NULL);
 }
 {
     return (m_refData != NULL);
 }

diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp
index 5f3ab6ed253b744a439ff1373981269f3b9fc94a..a3520e69f5980257d71ffdf168492e7fc6ebf39a 100644 (file)
--- a/src/gtk/gnome/gprint.cpp
+++ b/src/gtk/gnome/gprint.cpp
@@ -851,7 +851,7 @@ wxGnomePrintDC::~wxGnomePrintDC()
 {
 }
 
 {
 }
 

-bool wxGnomePrintDC::Ok() const
+bool wxGnomePrintDC::IsOk() const

 {
     return true;
 }
 {
     return true;
 }

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index e5c2c1d354014ed253cae5a9a1afa77fc7b92310..1e7534bcc2c80ff05b310f6be3e10ee27a15d32f 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -1076,7 +1076,7 @@ bool wxBitmap::operator != ( const wxBitmap& bmp ) const
     return m_refData != bmp.m_refData;
 }
 
     return m_refData != bmp.m_refData;
 }
 

-bool wxBitmap::Ok() const
+bool wxBitmap::IsOk() const

 {
     return (m_refData != NULL) &&
            (M_BMPDATA->m_bitmap || M_BMPDATA->m_pixmap);
 {
     return (m_refData != NULL) &&
            (M_BMPDATA->m_bitmap || M_BMPDATA->m_pixmap);

diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp
index 3f87647fd3985591d9d5b61599a567f5219075b0..4f4ab1af4a860520ee13c654dbe78093d80e33b4 100644 (file)
--- a/src/gtk1/cursor.cpp
+++ b/src/gtk1/cursor.cpp
@@ -326,7 +326,7 @@ bool wxCursor::operator != ( const wxCursor& cursor ) const
     return m_refData != cursor.m_refData;
 }
 
     return m_refData != cursor.m_refData;
 }
 

-bool wxCursor::Ok() const
+bool wxCursor::IsOk() const

 {
     return (m_refData != NULL);
 }
 {
     return (m_refData != NULL);
 }

diff --git a/src/mac/carbon/accel.cpp b/src/mac/carbon/accel.cpp
index 839184384c562643f5be7210e738da27bc43c01c..484b49e5adb24bfded02019e2b5066766afb394d 100644 (file)
--- a/src/mac/carbon/accel.cpp
+++ b/src/mac/carbon/accel.cpp
@@ -77,7 +77,7 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
     }
 }
 
     }
 }
 

-bool wxAcceleratorTable::Ok() const
+bool wxAcceleratorTable::IsOk() const

 {
     return (m_refData != NULL);
 }
 {
     return (m_refData != NULL);
 }

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index ed9892706ce8ba27964c1bdd7175dc9e13a13d89..706db8ac401b3cf61387c77a152644f183f58263 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -1196,7 +1196,7 @@ bool wxBitmap::SaveFile( const wxString& filename,
     return success;
 }
 
     return success;
 }
 

-bool wxBitmap::Ok() const
+bool wxBitmap::IsOk() const

 {
    return (M_BITMAPDATA && M_BITMAPDATA->Ok());
 }
 {
    return (M_BITMAPDATA && M_BITMAPDATA->Ok());
 }

diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp
index bf87cc5a8898624e74de87fb380b1f928c85dcaf..9176de3dc88b18f8f3eeeaa48634eaba8c862c2f 100644 (file)
--- a/src/mac/carbon/cursor.cpp
+++ b/src/mac/carbon/cursor.cpp
@@ -282,7 +282,7 @@ WXHCURSOR wxCursor::GetHCURSOR() const
     return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0);
 }
 
     return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0);
 }
 

-bool wxCursor::Ok() const
+bool wxCursor::IsOk() const

 {
     return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ;
 }
 {
     return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ;
 }

diff --git a/src/mac/carbon/icon.cpp b/src/mac/carbon/icon.cpp
index 26113eac7a92baeeec07f49a29895e182d5e86a5..7084b59cfcd6f6e2a6f545c18f3c577fb1cf75a0 100644 (file)
--- a/src/mac/carbon/icon.cpp
+++ b/src/mac/carbon/icon.cpp
@@ -95,7 +95,7 @@ void wxIcon::SetHeight( int height )
 {
 }
 
 {
 }
 

-bool wxIcon::Ok() const
+bool wxIcon::IsOk() const

 {
     return m_refData != NULL ;
 }
 {
     return m_refData != NULL ;
 }

diff --git a/src/mac/carbon/metafile.cpp b/src/mac/carbon/metafile.cpp
index f25d2d061d09d26d5da2076db55adef2fe16a4ee..0b15a9e246c4faf42c636b78083180e280e57429 100644 (file)
--- a/src/mac/carbon/metafile.cpp
+++ b/src/mac/carbon/metafile.cpp
@@ -92,7 +92,7 @@ wxMetaFile::~wxMetaFile()
 {
 }
 
 {
 }
 

-bool wxMetaFile::Ok() const
+bool wxMetaFile::IsOk() const

 {
     return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != NULL));
 }
 {
     return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != NULL));
 }

diff --git a/src/mac/carbon/printmac.cpp b/src/mac/carbon/printmac.cpp
index 8ae0ce8f37220c18fc13015bff0027aade67d720..1e16efc6a7eb3a3c89b44af041c7e8ddc659d410 100644 (file)
--- a/src/mac/carbon/printmac.cpp
+++ b/src/mac/carbon/printmac.cpp
@@ -41,7 +41,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMacCarbonPrintData, wxPrintNativeDataBase)
 IMPLEMENT_DYNAMIC_CLASS(wxMacPrinter, wxPrinterBase)
 IMPLEMENT_CLASS(wxMacPrintPreview, wxPrintPreviewBase)
 
 IMPLEMENT_DYNAMIC_CLASS(wxMacPrinter, wxPrinterBase)
 IMPLEMENT_CLASS(wxMacPrintPreview, wxPrintPreviewBase)
 

-bool wxMacCarbonPrintData::Ok() const
+bool wxMacCarbonPrintData::IsOk() const

 {
     return (m_macPageFormat != kPMNoPageFormat) && (m_macPrintSettings != kPMNoPrintSettings) && (m_macPrintSession != kPMNoReference);
 }
 {
     return (m_macPageFormat != kPMNoPageFormat) && (m_macPrintSettings != kPMNoPrintSettings) && (m_macPrintSession != kPMNoReference);
 }

diff --git a/src/mac/classic/accel.cpp b/src/mac/classic/accel.cpp
index 71714f9d7f88d2a23af453fdc8f32d1500134d6a..89bb4336a004a56ae5b8c03793a008bca6dacabe 100644 (file)
--- a/src/mac/classic/accel.cpp
+++ b/src/mac/classic/accel.cpp
@@ -77,7 +77,7 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
     }
 }
 
     }
 }
 

-bool wxAcceleratorTable::Ok() const
+bool wxAcceleratorTable::IsOk() const

 {
     return (m_refData != NULL);
 }
 {
     return (m_refData != NULL);
 }

diff --git a/src/mac/classic/bitmap.cpp b/src/mac/classic/bitmap.cpp
index beae4cbe2d0b4cfd734ad12f351b5199dce97a88..768b729616f0ac6039d933591b976785716c7333 100644 (file)
--- a/src/mac/classic/bitmap.cpp
+++ b/src/mac/classic/bitmap.cpp
@@ -957,7 +957,7 @@ bool wxBitmap::SaveFile(const wxString& filename, wxBitmapType type,
     return false;
 }
 
     return false;
 }
 

-bool wxBitmap::Ok() const
+bool wxBitmap::IsOk() const

 {
    return (M_BITMAPDATA && M_BITMAPDATA->m_ok);
 }
 {
    return (M_BITMAPDATA && M_BITMAPDATA->m_ok);
 }

diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp
index bd29f369b0ac923ccd532db5b3b59ad0b93f51e1..a1a9c5695fe3dbbf263e279d53792d31b22a7c0f 100644 (file)
--- a/src/mgl/bitmap.cpp
+++ b/src/mgl/bitmap.cpp
@@ -277,7 +277,7 @@ bool wxBitmap::operator != (const wxBitmap& bmp) const
     return (m_refData != bmp.m_refData);
 }
 
     return (m_refData != bmp.m_refData);
 }
 

-bool wxBitmap::Ok() const
+bool wxBitmap::IsOk() const

 {
     return (m_refData != NULL && M_BMPDATA->m_bitmap != NULL);
 }
 {
     return (m_refData != NULL && M_BMPDATA->m_bitmap != NULL);
 }

diff --git a/src/mgl/brush.cpp b/src/mgl/brush.cpp
index cf45da2f9a81cceafea69327a9336785cd905e9d..9415eea4487c04f8494e6deb4a316aacaa1d1cdc 100644 (file)
--- a/src/mgl/brush.cpp
+++ b/src/mgl/brush.cpp
@@ -153,7 +153,7 @@ bool wxBrush::operator != (const wxBrush& brush) const
     return m_refData != brush.m_refData;
 }
 
     return m_refData != brush.m_refData;
 }
 

-bool wxBrush::Ok() const
+bool wxBrush::IsOk() const

 {
     return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
 }
 {
     return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
 }

diff --git a/src/mgl/cursor.cpp b/src/mgl/cursor.cpp
index 7614434e79fe5556c6318224f941896245194745..709b59e34f341f94e25fcfd6366814c77656e59e 100644 (file)
--- a/src/mgl/cursor.cpp
+++ b/src/mgl/cursor.cpp
@@ -185,7 +185,7 @@ bool wxCursor::operator != (const wxCursor& cursor) const
     return (m_refData != cursor.m_refData);
 }
 
     return (m_refData != cursor.m_refData);
 }
 

-bool wxCursor::Ok() const
+bool wxCursor::IsOk() const

 {
     return (m_refData != NULL);
 }
 {
     return (m_refData != NULL);
 }

diff --git a/src/mgl/palette.cpp b/src/mgl/palette.cpp
index 531023287f208a59f0a025c17818a5f82c51c725..da815d8ab100205e4ec5ef8702c1bd29a7d19cc1 100644 (file)
--- a/src/mgl/palette.cpp
+++ b/src/mgl/palette.cpp
@@ -73,7 +73,7 @@ bool wxPalette::operator != (const wxPalette& palette) const
     return m_refData != palette.m_refData;
 }
 
     return m_refData != palette.m_refData;
 }
 

-bool wxPalette::Ok(void) const
+bool wxPalette::IsOk(void) const

 {
     return (m_refData != NULL);
 }
 {
     return (m_refData != NULL);
 }

diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp
index 35f6247489365cfa544a65573f1e20f80481856b..4c63041cbfd62b6975c6223fe8d80254c56ac37c 100644 (file)
--- a/src/mgl/pen.cpp
+++ b/src/mgl/pen.cpp
@@ -237,7 +237,7 @@ void* wxPen::GetPixPattern() const
 }
 
 
 }
 
 

-bool wxPen::Ok() const
+bool wxPen::IsOk() const

 {
     return (m_refData != NULL);
 }
 {
     return (m_refData != NULL);
 }

diff --git a/src/motif/accel.cpp b/src/motif/accel.cpp
index ac913b5881ae82dca805111a730d8f4eaaf840fa..1a2f7fd39356342f7be3588e07e7b71a5ec396c3 100644 (file)
--- a/src/motif/accel.cpp
+++ b/src/motif/accel.cpp
@@ -80,7 +80,7 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
 
 }
 
 
 }
 

-bool wxAcceleratorTable::Ok() const
+bool wxAcceleratorTable::IsOk() const

 {
     return (m_refData != (wxAcceleratorRefData*) NULL);
 }
 {
     return (m_refData != (wxAcceleratorRefData*) NULL);
 }

diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index a40c79befa355fa5feb571e144da1878da8c04d9..6bfc0ab44161f401e66daeb5b44b10fb6ebadaed 100644 (file)
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -293,7 +293,7 @@ wxCursor::~wxCursor()
 {
 }
 
 {
 }
 

-bool wxCursor::Ok() const
+bool wxCursor::IsOk() const

 {
     return m_refData != NULL;
 }
 {
     return m_refData != NULL;
 }

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index 63588c3086356f4d6813c6450713a1fc60d764c4..b1451eedfe71bd53247412bc7890e63a5a0fb555 100644 (file)
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -140,7 +140,7 @@ bool wxAcceleratorTable::operator==(const wxAcceleratorTable& accel) const
                      : !accelData;
 }
 
                      : !accelData;
 }
 

-bool wxAcceleratorTable::Ok() const
+bool wxAcceleratorTable::IsOk() const

 {
     return (M_ACCELDATA && (M_ACCELDATA->m_ok));
 }
 {
     return (M_ACCELDATA && (M_ACCELDATA->m_ok));
 }

diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp
index 4fb94bd7993a25bde9e2b33129283e18ab98d696..ea57745e7898367e75c161f8e2e7cfb9524bb5db 100644 (file)
--- a/src/msw/printdlg.cpp
+++ b/src/msw/printdlg.cpp
@@ -136,7 +136,7 @@ wxWindowsPrintNativeData::~wxWindowsPrintNativeData()
         GlobalFree(hDevNames);
 }
 
         GlobalFree(hDevNames);
 }
 

-bool wxWindowsPrintNativeData::Ok() const
+bool wxWindowsPrintNativeData::IsOk() const

 {
     return (m_devMode != NULL) ;
 }
 {
     return (m_devMode != NULL) ;
 }

diff --git a/src/os2/accel.cpp b/src/os2/accel.cpp
index db62b9bf36bf73edfe4d80df0d76f1e685c6e9b5..3dc254182f641b23d25ac4815d8ef3dae2c23b91 100644 (file)
--- a/src/os2/accel.cpp
+++ b/src/os2/accel.cpp
@@ -168,10 +168,10 @@ wxAcceleratorTable::wxAcceleratorTable(
     M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0);
 } // end of wxAcceleratorTable::wxAcceleratorTable
 
     M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0);
 } // end of wxAcceleratorTable::wxAcceleratorTable
 

-bool wxAcceleratorTable::Ok() const
+bool wxAcceleratorTable::IsOk() const

 {
     return(M_ACCELDATA && (M_ACCELDATA->m_ok));
 {
     return(M_ACCELDATA && (M_ACCELDATA->m_ok));

-} // end of wxAcceleratorTable::Ok
+} // end of wxAcceleratorTable::IsOk

 
 void wxAcceleratorTable::SetHACCEL(WXHACCEL hAccel)
 {
 
 void wxAcceleratorTable::SetHACCEL(WXHACCEL hAccel)
 {

diff --git a/src/palmos/accel.cpp b/src/palmos/accel.cpp
index e2a28afb7f75571917825442473b32b587e5df88..e6f57eac06360fb302536c9ff65badefbc968aee 100644 (file)
--- a/src/palmos/accel.cpp
+++ b/src/palmos/accel.cpp
@@ -71,7 +71,7 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
 {
 }
 
 {
 }
 

-bool wxAcceleratorTable::Ok() const
+bool wxAcceleratorTable::IsOk() const

 {
     return false;
 }
 {
     return false;
 }

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index 1c85afbe022ed915b4139d5cdbba3190a0058d9d..7e42116984e8ac6625a55de63e9977b3f159181e 100644 (file)
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -927,7 +927,7 @@ bool wxBitmap::operator != ( const wxBitmap& bmp ) const
     return m_refData != bmp.m_refData;
 }
 
     return m_refData != bmp.m_refData;
 }
 

-bool wxBitmap::Ok() const
+bool wxBitmap::IsOk() const

 {
     return (m_refData != NULL);
 }
 {
     return (m_refData != NULL);
 }

diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp
index 49e9f1c1d7752481fea5595872728dd0759cb0f1..bd861353d6082de93f9ccb259112793f0781e66b 100644 (file)
--- a/src/x11/cursor.cpp
+++ b/src/x11/cursor.cpp
@@ -151,7 +151,7 @@ bool wxCursor::operator != ( const wxCursor& cursor ) const
     return m_refData != cursor.m_refData;
 }
 
     return m_refData != cursor.m_refData;
 }
 

-bool wxCursor::Ok() const
+bool wxCursor::IsOk() const

 {
     return (m_refData != NULL);
 }
 {
     return (m_refData != NULL);
 }