X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b64e79868d4d32c3541bbd049d3f9f94c8edbfe..dd107c50be43e8d4dbdba20df162faf119a3781c:/src/generic/colrdlgg.cpp?ds=sidebyside

diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index dae8bbb6c2..b097bcaa10 100644
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -41,7 +41,6 @@
 
 #include "wx/generic/colrdlgg.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
 
 BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog)
@@ -54,66 +53,65 @@ BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog)
     EVT_CLOSE(wxGenericColourDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
-#endif
 
 /*
  * Generic wxColourDialog
  */
 
 #define NUM_COLS 48
-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")
+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")
             };
 
 wxGenericColourDialog::wxGenericColourDialog()
@@ -123,8 +121,8 @@ wxGenericColourDialog::wxGenericColourDialog()
   colourSelection = 0;
 }
 
-wxGenericColourDialog::wxGenericColourDialog(wxWindow *parent, wxColourData *data):
-  wxDialog(parent, -1, "Colour", wxPoint(0, 0), wxSize(900, 900), wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
+wxGenericColourDialog::wxGenericColourDialog(wxWindow *parent,
+                                             wxColourData *data)
 {
   whichKind = 1;
   colourSelection = 0;
@@ -142,16 +140,21 @@ void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 
 bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
 {
-  dialogParent = parent;
+    if ( !wxDialog::Create(parent, -1, wxT("Colour"),
+                           wxPoint(0, 0), wxSize(900, 900),
+                           wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL) )
+        return FALSE;
+
+    dialogParent = parent;
 
-  if (data)
-    colourData = *data;
+    if (data)
+        colourData = *data;
 
-  InitializeColours();
-  CalculateMeasurements();
-  CreateWidgets();
+    InitializeColours();
+    CalculateMeasurements();
+    CreateWidgets();
 
-  return TRUE;
+    return TRUE;
 }
 
 int wxGenericColourDialog::ShowModal()
@@ -189,7 +192,7 @@ void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event)
 
 void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
 {
-#ifndef __WXMOTIF__
+#if !defined(__WXMOTIF__) && !defined(__WXMAC__) && !defined(__WXPM__)
   wxDialog::OnPaint(event);
 #endif
 
@@ -255,7 +258,7 @@ void wxGenericColourDialog::CreateWidgets()
 
     // 1) space for explicitly layouted controls
     topsizer->Add( sliderX + 3*sliderSpacing, sliderHeight+25 );
-    
+
 #if wxUSE_STATLINE
     // 2) static line
     topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
@@ -268,7 +271,7 @@ void wxGenericColourDialog::CreateWidgets()
 
     SetAutoLayout( TRUE );
     SetSizer( topsizer );
-    
+
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
@@ -291,11 +294,6 @@ void wxGenericColourDialog::InitializeColours(void)
 
   for (i = 0; i < 16; i++)
     customColours[i] =
-/*
-#ifndef __VMS__
-     (wxColour&)
-#endif
-*/
        colourData.GetCustomColour(i);
 
   singleCustomColour.Set(0, 0, 0);