X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..105e45b9d02d7e9ed10923957ae1ce60c037273d:/src/generic/colrdlgg.cpp diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp index 9080ef2b02..2e3f8ce919 100644 --- a/src/generic/colrdlgg.cpp +++ b/src/generic/colrdlgg.cpp @@ -85,7 +85,7 @@ static wxString wxColourDialogNames[NUM_COLS]={"ORANGE", "FIREBRICK", "CORAL", "FOREST GREEN", - "AQUARAMINE", + "AQUAMARINE", "BLUE", "NAVY", "THISTLE", @@ -228,12 +228,12 @@ void wxGenericColourDialog::CreateWidgets(void) { 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); - (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; @@ -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); - SetClientSize(sliderX + 3*sliderSpacing, buttonY + 30); + SetClientSize(sliderX + 3*sliderSpacing, buttonY + 40); okButton->SetDefault(); Centre(wxBOTH);