Added #include wx/dcclient.h and wx/settings.h for Vadims new code under

[wxWidgets.git] / src / generic / colrdlgg.cpp

diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index f04731070bd738cf692d20d846a2a1765f9d913d..e445147cf1ab6c5c95057b6bd10291b375651876 100644 (file)
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -130,7 +130,7 @@ wxGenericColourDialog::~wxGenericColourDialog(void)
 {
 }
 
-void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& event)
+void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 {
   EndModal(wxID_CANCEL);
 }
@@ -184,7 +184,9 @@ void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event)
 
 void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
 {
+#ifndef __WXMOTIF__
   wxDialog::OnPaint(event);
+#endif
 
   wxPaintDC dc(this);