Added size event for status bar

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

diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index 9080ef2b0214ee8c1e0d02f2b38cd94813e9a7b2..daec7a16fba08466b311555199ec0ec9b6de7a2c 100644 (file)
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -40,7 +40,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
 
 BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog)
 IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
 
 BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog)

-       EVT_BUTTON(wxID_ADD_CUSTOM, wxGenericColourDialog::OnAddCustom)
+       EVT_BUTTON(wxID_ADD_CUSTOM, wxGenericColourDialog::OnAddCustom)

        EVT_SLIDER(wxID_RED_SLIDER, wxGenericColourDialog::OnRedSlider)
        EVT_SLIDER(wxID_GREEN_SLIDER, wxGenericColourDialog::OnGreenSlider)
        EVT_SLIDER(wxID_BLUE_SLIDER, wxGenericColourDialog::OnBlueSlider)
        EVT_SLIDER(wxID_RED_SLIDER, wxGenericColourDialog::OnRedSlider)
        EVT_SLIDER(wxID_GREEN_SLIDER, wxGenericColourDialog::OnGreenSlider)
        EVT_SLIDER(wxID_BLUE_SLIDER, wxGenericColourDialog::OnBlueSlider)


@@ -85,7 +85,7 @@ static wxString wxColourDialogNames[NUM_COLS]={"ORANGE",
                                    "FIREBRICK",
                                    "CORAL",
                                    "FOREST GREEN",
                                    "FIREBRICK",
                                    "CORAL",
                                    "FOREST GREEN",

-                                   "AQUARAMINE",
+                                   "AQUAMARINE",

                                    "BLUE",
                                    "NAVY",
                                    "THISTLE",
                                    "BLUE",
                                    "NAVY",
                                    "THISTLE",


@@ -228,12 +228,12 @@ void wxGenericColourDialog::CreateWidgets(void)
 {
   wxBeginBusyCursor();
   
 {
   wxBeginBusyCursor();
   

-  wxButton *okButton = new wxButton(this, wxID_OK, "OK", wxPoint(okButtonX, buttonY));
+  wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(okButtonX, buttonY));

   int bw, bh;
   okButton->GetSize(&bw, &bh);
 
   int bw, bh;
   okButton->GetSize(&bw, &bh);
 

-  (void) new wxButton(this, wxID_CANCEL, "Cancel", wxPoint(okButtonX + bw + 10, buttonY));
-  (void) new wxButton(this, wxID_ADD_CUSTOM, "Add to custom colours",
+  (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(okButtonX + bw + 20, buttonY));
+  (void) new wxButton(this, wxID_ADD_CUSTOM, _("Add to custom colours"),

      wxPoint(customButtonX, buttonY));
 
   int sliderX = singleCustomColourRect.x + singleCustomColourRect.width + sectionSpacing;
      wxPoint(customButtonX, buttonY));
 
   int sliderX = singleCustomColourRect.x + singleCustomColourRect.width + sectionSpacing;


@@ -252,7 +252,7 @@ void wxGenericColourDialog::CreateWidgets(void)
   blueSlider = new wxSlider(this, wxID_BLUE_SLIDER, 0, 0, 255,
    wxPoint(sliderX + 2*sliderSpacing, 10), wxSize(-1, sliderHeight), wxVERTICAL|wxSL_LABELS);
 
   blueSlider = new wxSlider(this, wxID_BLUE_SLIDER, 0, 0, 255,
    wxPoint(sliderX + 2*sliderSpacing, 10), wxSize(-1, sliderHeight), wxVERTICAL|wxSL_LABELS);
 

-  SetClientSize(sliderX + 3*sliderSpacing, buttonY + 30);
+  SetClientSize(sliderX + 3*sliderSpacing, buttonY + 40);

   okButton->SetDefault();
 
   Centre(wxBOTH);
   okButton->SetDefault();
 
   Centre(wxBOTH);