removed mentions of wxUSE_OWNER_DRAWN: unless I miss something, this doesn't make...

[wxWidgets.git] / src / mac / carbon / colordlg.cpp

diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp
index d3664a6d0fe537fb96468fd998397c1eb6c2490f..6c542fdcfb86924911d8141fc02344c146acc043 100644 (file)
--- a/src/mac/carbon/colordlg.cpp
+++ b/src/mac/carbon/colordlg.cpp
@@ -46,17 +46,17 @@ wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data)
 bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 {
     m_dialogParent = parent;
 bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 {
     m_dialogParent = parent;

-  
+

     if (data)
         m_colourData = *data;
     if (data)
         m_colourData = *data;

-    return TRUE;
+    return true;

 }
 
 int wxColourDialog::ShowModal()
 {
     Point where ;
     RGBColor currentColor = *((RGBColor*)m_colourData.m_dataColour.GetPixel()) , newColor ;
 }
 
 int wxColourDialog::ShowModal()
 {
     Point where ;
     RGBColor currentColor = *((RGBColor*)m_colourData.m_dataColour.GetPixel()) , newColor ;

-    
+

     where.h = where.v = -1;
 
     if (GetColor( where, "\pSelect a new palette color.", &currentColor, &newColor ))
     where.h = where.v = -1;
 
     if (GetColor( where, "\pSelect a new palette color.", &currentColor, &newColor ))


@@ -64,10 +64,6 @@ int wxColourDialog::ShowModal()
         m_colourData.m_dataColour.Set( (WXCOLORREF*) &newColor ) ;
         return wxID_OK;
     }
         m_colourData.m_dataColour.Set( (WXCOLORREF*) &newColor ) ;
         return wxID_OK;
     }

-    else
-    {
-        return wxID_CANCEL;
-    }

 
     return wxID_CANCEL;
 }
 
     return wxID_CANCEL;
 }