EVT_SLIDER(wxID_BLUE_SLIDER, wxGenericColourDialog::OnBlueSlider)
EVT_PAINT(wxGenericColourDialog::OnPaint)
EVT_MOUSE_EVENTS(wxGenericColourDialog::OnMouseEvent)
+ EVT_CLOSE(wxGenericColourDialog::OnCloseWindow)
END_EVENT_TABLE()
#endif
*/
#define NUM_COLS 48
-static wxString wxColourDialogNames[NUM_COLS]={"ORANGE",
- "GOLDENROD",
- "WHEAT",
- "SPRING GREEN",
- "SKY BLUE",
- "SLATE BLUE",
- "MEDIUM VIOLET RED",
- "PURPLE",
-
- "RED",
- "YELLOW",
- "MEDIUM SPRING GREEN",
- "PALE GREEN",
- "CYAN",
- "LIGHT STEEL BLUE",
- "ORCHID",
- "LIGHT MAGENTA",
+static wxString wxColourDialogNames[NUM_COLS]={_T("ORANGE"),
+ _T("GOLDENROD"),
+ _T("WHEAT"),
+ _T("SPRING GREEN"),
+ _T("SKY BLUE"),
+ _T("SLATE BLUE"),
+ _T("MEDIUM VIOLET RED"),
+ _T("PURPLE"),
+
+ _T("RED"),
+ _T("YELLOW"),
+ _T("MEDIUM SPRING GREEN"),
+ _T("PALE GREEN"),
+ _T("CYAN"),
+ _T("LIGHT STEEL BLUE"),
+ _T("ORCHID"),
+ _T("LIGHT MAGENTA"),
- "BROWN",
- "YELLOW",
- "GREEN",
- "CADET BLUE",
- "MEDIUM BLUE",
- "MAGENTA",
- "MAROON",
- "ORANGE RED",
-
- "FIREBRICK",
- "CORAL",
- "FOREST GREEN",
- "AQUAMARINE",
- "BLUE",
- "NAVY",
- "THISTLE",
- "MEDIUM VIOLET RED",
+ _T("BROWN"),
+ _T("YELLOW"),
+ _T("GREEN"),
+ _T("CADET BLUE"),
+ _T("MEDIUM BLUE"),
+ _T("MAGENTA"),
+ _T("MAROON"),
+ _T("ORANGE RED"),
+
+ _T("FIREBRICK"),
+ _T("CORAL"),
+ _T("FOREST GREEN"),
+ _T("AQUAMARINE"),
+ _T("BLUE"),
+ _T("NAVY"),
+ _T("THISTLE"),
+ _T("MEDIUM VIOLET RED"),
- "INDIAN RED",
- "GOLD",
- "MEDIUM SEA GREEN",
- "MEDIUM BLUE",
- "MIDNIGHT BLUE",
- "GREY",
- "PURPLE",
- "KHAKI",
+ _T("INDIAN RED"),
+ _T("GOLD"),
+ _T("MEDIUM SEA GREEN"),
+ _T("MEDIUM BLUE"),
+ _T("MIDNIGHT BLUE"),
+ _T("GREY"),
+ _T("PURPLE"),
+ _T("KHAKI"),
- "BLACK",
- "MEDIUM FOREST GREEN",
- "KHAKI",
- "DARK GREY",
- "SEA GREEN",
- "LIGHT GREY",
- "MEDIUM SLATE BLUE",
- "WHITE"
+ _T("BLACK"),
+ _T("MEDIUM FOREST GREEN"),
+ _T("KHAKI"),
+ _T("DARK GREY"),
+ _T("SEA GREEN"),
+ _T("LIGHT GREY"),
+ _T("MEDIUM SLATE BLUE"),
+ _T("WHITE")
};
wxGenericColourDialog::wxGenericColourDialog(void)
{
}
-bool wxGenericColourDialog::OnClose(void)
+void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
{
- Show(FALSE);
- return FALSE;
+ EndModal(wxID_CANCEL);
}
bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
{
wxBeginBusyCursor();
- wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(okButtonX, buttonY));
+ wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(okButtonX, buttonY), wxSize(75,-1) );
int bw, bh;
okButton->GetSize(&bw, &bh);
- (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(okButtonX + bw + 20, buttonY));
+ (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(okButtonX + bw + 20, buttonY), wxSize(75,-1));
(void) new wxButton(this, wxID_ADD_CUSTOM, _("Add to custom colours"),
wxPoint(customButtonX, buttonY));