1. serious bug in wxRegConfig corrected - deleting a value would delete the

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

diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index a78508f7432deacd0096b255011a410b22361561..e445147cf1ab6c5c95057b6bd10291b375651876 100644 (file)
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -86,7 +86,7 @@ static wxString wxColourDialogNames[NUM_COLS]={_T("ORANGE"),
                                    _T("FIREBRICK"),
                                    _T("CORAL"),
                                    _T("FOREST GREEN"),
-                                   _T("AQUARAMINE"),
+                                   _T("AQUAMARINE"),
                                    _T("BLUE"),
                                    _T("NAVY"),
                                    _T("THISTLE"),
@@ -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);