reSWIGged

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

diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index bc7ea6f7eb18caf30b89a25e9eff10fd02e5d118..494858f390672cc8e9112421cc6afb11eaf90e6d 100644 (file)
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "colrdlgg.h"
 #endif
 
@@ -58,61 +58,64 @@ END_EVENT_TABLE()
  * Generic wxColourDialog
  */
 
-#define NUM_COLS 48
-static wxString wxColourDialogNames[NUM_COLS]={wxT("ORANGE"),
-            wxT("GOLDENROD"),
-            wxT("WHEAT"),
-            wxT("SPRING GREEN"),
-            wxT("SKY BLUE"),
-            wxT("SLATE BLUE"),
-            wxT("MEDIUM VIOLET RED"),
-            wxT("PURPLE"),
-
-            wxT("RED"),
-            wxT("YELLOW"),
-            wxT("MEDIUM SPRING GREEN"),
-            wxT("PALE GREEN"),
-            wxT("CYAN"),
-            wxT("LIGHT STEEL BLUE"),
-            wxT("ORCHID"),
-            wxT("LIGHT MAGENTA"),
-
-            wxT("BROWN"),
-            wxT("YELLOW"),
-            wxT("GREEN"),
-            wxT("CADET BLUE"),
-            wxT("MEDIUM BLUE"),
-            wxT("MAGENTA"),
-            wxT("MAROON"),
-            wxT("ORANGE RED"),
-
-            wxT("FIREBRICK"),
-            wxT("CORAL"),
-            wxT("FOREST GREEN"),
-            wxT("AQUAMARINE"),
-            wxT("BLUE"),
-            wxT("NAVY"),
-            wxT("THISTLE"),
-            wxT("MEDIUM VIOLET RED"),
-
-            wxT("INDIAN RED"),
-            wxT("GOLD"),
-            wxT("MEDIUM SEA GREEN"),
-            wxT("MEDIUM BLUE"),
-            wxT("MIDNIGHT BLUE"),
-            wxT("GREY"),
-            wxT("PURPLE"),
-            wxT("KHAKI"),
-
-            wxT("BLACK"),
-            wxT("MEDIUM FOREST GREEN"),
-            wxT("KHAKI"),
-            wxT("DARK GREY"),
-            wxT("SEA GREEN"),
-            wxT("LIGHT GREY"),
-            wxT("MEDIUM SLATE BLUE"),
-            wxT("WHITE")
-            };
+// don't change the number of elements (48) in this array, the code below is
+// hardcoded to use it
+static const wxChar *wxColourDialogNames[] =
+{
+    wxT("ORANGE"),
+    wxT("GOLDENROD"),
+    wxT("WHEAT"),
+    wxT("SPRING GREEN"),
+    wxT("SKY BLUE"),
+    wxT("SLATE BLUE"),
+    wxT("MEDIUM VIOLET RED"),
+    wxT("PURPLE"),
+
+    wxT("RED"),
+    wxT("YELLOW"),
+    wxT("MEDIUM SPRING GREEN"),
+    wxT("PALE GREEN"),
+    wxT("CYAN"),
+    wxT("LIGHT STEEL BLUE"),
+    wxT("ORCHID"),
+    wxT("LIGHT MAGENTA"),
+
+    wxT("BROWN"),
+    wxT("YELLOW"),
+    wxT("GREEN"),
+    wxT("CADET BLUE"),
+    wxT("MEDIUM BLUE"),
+    wxT("MAGENTA"),
+    wxT("MAROON"),
+    wxT("ORANGE RED"),
+
+    wxT("FIREBRICK"),
+    wxT("CORAL"),
+    wxT("FOREST GREEN"),
+    wxT("AQUAMARINE"),
+    wxT("BLUE"),
+    wxT("NAVY"),
+    wxT("THISTLE"),
+    wxT("MEDIUM VIOLET RED"),
+
+    wxT("INDIAN RED"),
+    wxT("GOLD"),
+    wxT("MEDIUM SEA GREEN"),
+    wxT("MEDIUM BLUE"),
+    wxT("MIDNIGHT BLUE"),
+    wxT("GREY"),
+    wxT("PURPLE"),
+    wxT("KHAKI"),
+
+    wxT("BLACK"),
+    wxT("MEDIUM FOREST GREEN"),
+    wxT("KHAKI"),
+    wxT("DARK GREY"),
+    wxT("SEA GREEN"),
+    wxT("LIGHT GREY"),
+    wxT("MEDIUM SLATE BLUE"),
+    wxT("WHITE")
+};
 
 wxGenericColourDialog::wxGenericColourDialog()
 {
@@ -171,6 +174,13 @@ void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event)
     int x = (int)event.GetX();
     int y = (int)event.GetY();
 
+#ifdef __WXPM__
+    // Handle OS/2's reverse coordinate system and account for the dialog title
+    int                             nClientHeight;
+
+    GetClientSize(NULL, &nClientHeight);
+    y = (nClientHeight - y) + 20;
+#endif
     if ((x >= standardColoursRect.x && x <= (standardColoursRect.x + standardColoursRect.width)) &&
         (y >= standardColoursRect.y && y <= (standardColoursRect.y + standardColoursRect.height)))
     {
@@ -196,7 +206,7 @@ void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event)
 
 void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
 {
-#if !defined(__WXMOTIF__) && !defined(__WXMAC__) && !defined(__WXPM__)
+#if !defined(__WXMOTIF__) && !defined(__WXMAC__) && !defined(__WXPM__) && !defined(__WXCOCOA__)
   wxDialog::OnPaint(event);
 #endif
 
@@ -219,7 +229,11 @@ void wxGenericColourDialog::CalculateMeasurements()
   sectionSpacing = 15;
 
   standardColoursRect.x = 10;
+#ifdef __WXPM__
+  standardColoursRect.y = 15 + 20; /* OS/2 needs to account for dialog titlebar */
+#else
   standardColoursRect.y = 15;
+#endif
   standardColoursRect.width = (8*smallRectangleSize.x) + (7*gridSpacing);
   standardColoursRect.height = (6*smallRectangleSize.y) + (5*gridSpacing);
 
@@ -286,9 +300,9 @@ void wxGenericColourDialog::CreateWidgets()
 
 void wxGenericColourDialog::InitializeColours(void)
 {
-    int i;
+    size_t i;
 
-    for (i = 0; i < 48; i++)
+    for (i = 0; i < WXSIZEOF(wxColourDialogNames); i++)
     {
         wxColour *col = wxTheColourDatabase->FindColour(wxColourDialogNames[i]);
         if (col)
@@ -307,7 +321,7 @@ void wxGenericColourDialog::InitializeColours(void)
     {
         bool initColourFound = FALSE;
 
-        for (i = 0; i < 48; i++)
+        for (i = 0; i < WXSIZEOF(wxColourDialogNames); i++)
         {
             if ( standardColours[i] == curr && !initColourFound )
             {