X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fba1b53b8706bc416db7f068c51f01658a621dcd..3682ea7d2cafc2cbb3f9093e0f864dfff54327dd:/samples/dialogs/dialogs.cpp?ds=sidebyside diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index 5d36625f14..6bb75cca8e 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma implementation #pragma interface #endif @@ -25,6 +25,10 @@ #include "wx/wx.h" #endif +#ifdef __WXWINCE__ +#include "wx/msw/wince/time.h" +#endif + #include "wx/colordlg.h" #include "wx/filedlg.h" #include "wx/dirdlg.h" @@ -238,7 +242,7 @@ void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event) ) wxColourData retData = dialog.GetColourData(); col = retData.GetColour(); myCanvas->SetBackgroundColour(col); - myCanvas->Clear(); + myCanvas->ClearBackground(); myCanvas->Refresh(); } } @@ -284,7 +288,7 @@ void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event)) wxColour col = retData.GetColour(); // wxBrush *brush = wxTheBrushList->FindOrCreateBrush(&col, wxSOLID); myCanvas->SetBackgroundColour(col); - myCanvas->Clear(); + myCanvas->ClearBackground(); myCanvas->Refresh(); } dialog->Destroy(); @@ -308,7 +312,7 @@ void MyFrame::ChooseFontGeneric(wxCommandEvent& WXUNUSED(event) ) } #endif // wxTEST_GENERIC_DIALOGS_IN_MSW -void MyFrame::LogDialog(wxCommandEvent& event) +void MyFrame::LogDialog(wxCommandEvent& WXUNUSED(event)) { // calling wxYield() (as ~wxBusyCursor does) shouldn't result in messages // being flushed -- test it @@ -631,7 +635,7 @@ void MyFrame::ModelessDlg(wxCommandEvent& event) } } -void MyFrame::ShowTip(wxCommandEvent& event) +void MyFrame::ShowTip(wxCommandEvent& WXUNUSED(event)) { #if wxUSE_STARTUP_TIPS static size_t s_index = (size_t)-1;