X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0a12e013f55022e684508316ad0079511e3b4fe7..516ed23a948380fab200457b5adb2907e0b180a0:/samples/controls/controls.cpp?ds=sidebyside diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index 79e9eebecf..8cf794f121 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -721,7 +721,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) for ( size_t n = 0; n < Image_Max; n++ ) { wxBitmap bmp(s_iconNames[n]); - if ( !bmp.Ok() || (imagelist->Add(bmp) == -1) ) + if ( !bmp.IsOk() || (imagelist->Add(bmp) == -1) ) { wxLogWarning(wxT("Couldn't load the image '%s' for the book control page %d."), s_iconNames[n], n); @@ -957,7 +957,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) #if defined(__WXMSW__) || defined(__WXMOTIF__) // test for masked bitmap display bitmap = wxBitmap(wxT("test2.bmp"), wxBITMAP_TYPE_BMP); - if (bitmap.Ok()) + if (bitmap.IsOk()) { bitmap.SetMask(new wxMask(bitmap, *wxBLUE)); @@ -1183,7 +1183,7 @@ void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event)) SetThemeEnabled(false); // test panel colour changing and propagation to the subcontrols - if ( s_colOld.Ok() ) + if ( s_colOld.IsOk() ) { SetBackgroundColour(s_colOld); s_colOld = wxNullColour;