use prefix file; (auto-)removed some of the unused ftp/java/x86 settings

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

diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index a5d264b557c8b9003edb3fd71afba5a0e8a4eb32..a506140419f432bb7906ee195a6808dc2252c749 100644 (file)
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -149,7 +149,7 @@ void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
 {
     if ( !wxDialog::Create(parent, wxID_ANY, _("Choose colour"),
-                           wxPoint(0, 0), wxSize(900, 900)) )
+                           wxPoint(0,0), wxSize(900, 900)) )
         return false;
 
     dialogParent = parent;
@@ -210,7 +210,7 @@ void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event)
 
 void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
 {
-#if !defined(__WXMOTIF__) && !defined(__WXMAC__) && !defined(__WXPM__) && !defined(__WXCOCOA__)
+#if !defined(__WXMOTIF__) && !defined(__WXPM__) && !defined(__WXCOCOA__)
   wxDialog::OnPaint(event);
 #endif
 
@@ -295,7 +295,7 @@ void wxGenericColourDialog::CreateWidgets()
     // 3) buttons
     wxSizer *buttonsizer = CreateButtonSizer( wxOK|wxCANCEL );
     buttonsizer->Add( new wxButton(this, wxID_ADD_CUSTOM, _("Add to custom colours") ), 0, wxLEFT|wxRIGHT, 10 );
-    topSizer->Add( buttonsizer, 0, wxCENTRE | wxALL, 10 );
+    topSizer->Add( buttonsizer, 0, wxEXPAND | wxALL, 10 );
 
     SetAutoLayout( true );
     SetSizer( topSizer );
@@ -493,15 +493,15 @@ void wxGenericColourDialog::OnBasicColourClick(int which)
     PaintHighlight(dc, false);
     whichKind = 1;
     colourSelection = which;
-    
+
 #if wxUSE_SLIDER
     redSlider->SetValue( standardColours[colourSelection].Red() );
     greenSlider->SetValue( standardColours[colourSelection].Green() );
     blueSlider->SetValue( standardColours[colourSelection].Blue() );
 #endif // wxUSE_SLIDER
-    
-    colourData.m_dataColour.Set(standardColours[colourSelection].Red(), 
-                                standardColours[colourSelection].Green(), 
+
+    colourData.m_dataColour.Set(standardColours[colourSelection].Red(),
+                                standardColours[colourSelection].Green(),
                                 standardColours[colourSelection].Blue());
 
     PaintCustomColour(dc);
@@ -514,17 +514,17 @@ void wxGenericColourDialog::OnCustomColourClick(int which)
     PaintHighlight(dc, false);
     whichKind = 2;
     colourSelection = which;
-    
+
 #if wxUSE_SLIDER
     redSlider->SetValue( customColours[colourSelection].Red() );
     greenSlider->SetValue( customColours[colourSelection].Green() );
     blueSlider->SetValue( customColours[colourSelection].Blue() );
 #endif // wxUSE_SLIDER
-    
-    colourData.m_dataColour.Set(customColours[colourSelection].Red(), 
-                                customColours[colourSelection].Green(), 
+
+    colourData.m_dataColour.Set(customColours[colourSelection].Red(),
+                                customColours[colourSelection].Green(),
                                 customColours[colourSelection].Blue());
-    
+
     PaintCustomColour(dc);
     PaintHighlight(dc, true);
 }
@@ -553,10 +553,10 @@ void wxGenericColourDialog::OnAddCustom(wxCommandEvent& WXUNUSED(event))
     PaintHighlight(dc, true);
   }
 
-  customColours[colourSelection].Set(colourData.m_dataColour.Red(), 
-                                     colourData.m_dataColour.Green(), 
+  customColours[colourSelection].Set(colourData.m_dataColour.Red(),
+                                     colourData.m_dataColour.Green(),
                                      colourData.m_dataColour.Blue());
-  
+
   colourData.SetCustomColour(colourSelection, customColours[colourSelection]);
 
   PaintCustomColours(dc);