cleanup - reformat

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

diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp
index 3c8411319b333758f23b5b26de4f970a09fa6c64..a60aad9323d51846e960b3eb7a1d6b35a02eea8a 100644 (file)
--- a/src/mac/carbon/colordlg.cpp
+++ b/src/mac/carbon/colordlg.cpp
@@ -10,15 +10,15 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "colordlg.h"
-#endif
+#include "wx/wxprec.h"

 
 #include "wx/mac/colordlg.h"
 
 #include "wx/mac/colordlg.h"

+#include "wx/fontdlg.h"
+
+
+#if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)

-#endif

 
 #include "wx/mac/private.h"
 #ifndef __DARWIN__
 
 #include "wx/mac/private.h"
 #ifndef __DARWIN__


@@ -42,17 +42,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 ))


@@ -60,11 +60,8 @@ 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;
 }
 

+#endif