Added an #ifdef

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

diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index 4e011463abd3583ee5ffc0553a2968e30df57ec3..5843141cabb7ae3e71749701ce1f1796f192fc6c 100644 (file)
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -40,12 +40,13 @@
 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_SLIDER(wxID_RED_SLIDER, wxGenericColourDialog::OnRedSlider)
-       EVT_SLIDER(wxID_GREEN_SLIDER, wxGenericColourDialog::OnGreenSlider)
-       EVT_SLIDER(wxID_BLUE_SLIDER, wxGenericColourDialog::OnBlueSlider)
-       EVT_PAINT(wxGenericColourDialog::OnPaint)
-       EVT_MOUSE_EVENTS(wxGenericColourDialog::OnMouseEvent)
+    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_PAINT(wxGenericColourDialog::OnPaint)
+    EVT_MOUSE_EVENTS(wxGenericColourDialog::OnMouseEvent)
+    EVT_CLOSE(wxGenericColourDialog::OnCloseWindow)

 END_EVENT_TABLE()
 
 #endif
 END_EVENT_TABLE()
 
 #endif


@@ -55,60 +56,60 @@ END_EVENT_TABLE()
  */
 
 #define NUM_COLS 48
  */
 
 #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",
-                                   
-                                   "BROWN",
-                                   "YELLOW",
-                                   "GREEN",
-                                   "CADET BLUE",
-                                   "MEDIUM BLUE",
-                                   "MAGENTA",
-                                   "MAROON",
-                                   "ORANGE RED",
-
-                                   "FIREBRICK",
-                                   "CORAL",
-                                   "FOREST GREEN",
-                                   "AQUARAMINE",
-                                   "BLUE",
-                                   "NAVY",
-                                   "THISTLE",
-                                   "MEDIUM VIOLET RED",
-                                   
-                                   "INDIAN RED",
-                                   "GOLD",
-                                   "MEDIUM SEA GREEN",
-                                   "MEDIUM BLUE",
-                                   "MIDNIGHT BLUE",
-                                   "GREY",
-                                   "PURPLE",
-                                   "KHAKI",
-                                   
-                                   "BLACK",
-                                   "MEDIUM FOREST GREEN",
-                                   "KHAKI",
-                                   "DARK GREY",
-                                   "SEA GREEN",
-                                   "LIGHT GREY",
-                                   "MEDIUM SLATE BLUE",
-                                   "WHITE"
-                                   };
+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"),
+
+            _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"),
+
+            _T("INDIAN RED"),
+            _T("GOLD"),
+            _T("MEDIUM SEA GREEN"),
+            _T("MEDIUM BLUE"),
+            _T("MIDNIGHT BLUE"),
+            _T("GREY"),
+            _T("PURPLE"),
+            _T("KHAKI"),
+
+            _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)
 {
 
 wxGenericColourDialog::wxGenericColourDialog(void)
 {


@@ -129,23 +130,22 @@ 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)
 {
   dialogParent = parent;
 }
 
 bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
 {
   dialogParent = parent;

-  
+

   if (data)
     colourData = *data;
 
   InitializeColours();
   CalculateMeasurements();
   CreateWidgets();
   if (data)
     colourData = *data;
 
   InitializeColours();
   CalculateMeasurements();
   CreateWidgets();

-  
+

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -184,7 +184,9 @@ void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event)
 
 void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
 {
 
 void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
 {

+#ifndef __WXMOTIF__

   wxDialog::OnPaint(event);
   wxDialog::OnPaint(event);

+#endif

 
   wxPaintDC dc(this);
 
 
   wxPaintDC dc(this);
 


@@ -227,12 +229,12 @@ void wxGenericColourDialog::CalculateMeasurements(void)
 void wxGenericColourDialog::CreateWidgets(void)
 {
   wxBeginBusyCursor();
 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), wxSize(75,-1) );

   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_CANCEL, _("Cancel"), wxPoint(okButtonX + bw + 20, buttonY), wxSize(75,-1));

   (void) new wxButton(this, wxID_ADD_CUSTOM, _("Add to custom colours"),
      wxPoint(customButtonX, buttonY));
 
   (void) new wxButton(this, wxID_ADD_CUSTOM, _("Add to custom colours"),
      wxPoint(customButtonX, buttonY));
 


@@ -244,7 +246,7 @@ void wxGenericColourDialog::CreateWidgets(void)
   int sliderSpacing = 45;
   int sliderHeight = 160;
 #endif
   int sliderSpacing = 45;
   int sliderHeight = 160;
 #endif

-  
+

   redSlider = new wxSlider(this, wxID_RED_SLIDER, 0, 0, 255,
    wxPoint(sliderX, 10), wxSize(-1, sliderHeight), wxVERTICAL|wxSL_LABELS);
   greenSlider = new wxSlider(this, wxID_GREEN_SLIDER, 0, 0, 255,
   redSlider = new wxSlider(this, wxID_RED_SLIDER, 0, 0, 255,
    wxPoint(sliderX, 10), wxSize(-1, sliderHeight), wxVERTICAL|wxSL_LABELS);
   greenSlider = new wxSlider(this, wxID_GREEN_SLIDER, 0, 0, 255,


@@ -252,7 +254,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);


@@ -295,7 +297,7 @@ void wxGenericColourDialog::PaintBasicColours(wxDC& dc)
     for (j = 0; j < 8; j++)
     {
       int ptr = i*8 + j;
     for (j = 0; j < 8; j++)
     {
       int ptr = i*8 + j;

-      
+

       int x = (j*(smallRectangleSize.x+gridSpacing) + standardColoursRect.x);
       int y = (i*(smallRectangleSize.y+gridSpacing) + standardColoursRect.y);
 
       int x = (j*(smallRectangleSize.x+gridSpacing) + standardColoursRect.x);
       int y = (i*(smallRectangleSize.y+gridSpacing) + standardColoursRect.y);
 


@@ -320,7 +322,7 @@ void wxGenericColourDialog::PaintCustomColours(wxDC& dc)
     for (j = 0; j < 8; j++)
     {
       int ptr = i*8 + j;
     for (j = 0; j < 8; j++)
     {
       int ptr = i*8 + j;

-      
+

       int x = (j*(smallRectangleSize.x+gridSpacing)) + customColoursRect.x;
       int y = (i*(smallRectangleSize.y+gridSpacing)) + customColoursRect.y;
 
       int x = (j*(smallRectangleSize.x+gridSpacing)) + customColoursRect.x;
       int y = (i*(smallRectangleSize.y+gridSpacing)) + customColoursRect.y;
 


@@ -374,18 +376,18 @@ void wxGenericColourDialog::PaintHighlight(wxDC& dc, bool draw)
       dc.SetPen(*wxBLACK_PEN);
     else
       dc.SetPen(*wxLIGHT_GREY_PEN);
       dc.SetPen(*wxBLACK_PEN);
     else
       dc.SetPen(*wxLIGHT_GREY_PEN);

-      
+

     dc.SetBrush(*wxTRANSPARENT_BRUSH);
     dc.DrawRectangle( x, y, (smallRectangleSize.x + (2*deltaX)), (smallRectangleSize.y + (2*deltaY)));
   }
     dc.SetBrush(*wxTRANSPARENT_BRUSH);
     dc.DrawRectangle( x, y, (smallRectangleSize.x + (2*deltaX)), (smallRectangleSize.y + (2*deltaY)));
   }

-  
+

   dc.EndDrawing();
 }
 
 void wxGenericColourDialog::PaintCustomColour(wxDC& dc)
 {
   dc.BeginDrawing();
   dc.EndDrawing();
 }
 
 void wxGenericColourDialog::PaintCustomColour(wxDC& dc)
 {
   dc.BeginDrawing();

-  
+

   dc.SetPen(*wxBLACK_PEN);
 
   wxBrush *brush = new wxBrush(singleCustomColour, wxSOLID);
   dc.SetPen(*wxBLACK_PEN);
 
   wxBrush *brush = new wxBrush(singleCustomColour, wxSOLID);


@@ -450,7 +452,7 @@ void wxGenericColourDialog::OnAddCustom(wxCommandEvent& WXUNUSED(event))
   customColours[colourSelection].Set(singleCustomColour.Red(), singleCustomColour.Green(), singleCustomColour.Blue());
   colourData.SetColour(customColours[colourSelection]);
   colourData.SetCustomColour(colourSelection, customColours[colourSelection]);
   customColours[colourSelection].Set(singleCustomColour.Red(), singleCustomColour.Green(), singleCustomColour.Blue());
   colourData.SetColour(customColours[colourSelection]);
   colourData.SetCustomColour(colourSelection, customColours[colourSelection]);

-  
+

   PaintCustomColours(dc);
 }
 
   PaintCustomColours(dc);
 }
 


@@ -458,7 +460,7 @@ void wxGenericColourDialog::OnRedSlider(wxCommandEvent& WXUNUSED(event))
 {
   if (!redSlider)
     return;
 {
   if (!redSlider)
     return;

-    
+

   wxClientDC dc(this);
   singleCustomColour.Set(redSlider->GetValue(), singleCustomColour.Green(), singleCustomColour.Blue());
   PaintCustomColour(dc);
   wxClientDC dc(this);
   singleCustomColour.Set(redSlider->GetValue(), singleCustomColour.Green(), singleCustomColour.Blue());
   PaintCustomColour(dc);