scaling for 24x24 and 64x64 sizes

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

diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp
index 2275a9a39d679502d0a4c20e4d09c29009dc9445..bea3f01b823cd7caf26898e6655668201d9e1d77 100644 (file)
--- a/src/mac/carbon/colordlg.cpp
+++ b/src/mac/carbon/colordlg.cpp
@@ -2,24 +2,35 @@
 // Name:        colordlg.cpp
 // Purpose:     wxColourDialog class. NOTE: you can use the generic class
 //              if you wish, instead of implementing this.
 // Name:        colordlg.cpp
 // Purpose:     wxColourDialog class. NOTE: you can use the generic class
 //              if you wish, instead of implementing this.

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "colordlg.h"
 #endif
 
 #pragma implementation "colordlg.h"
 #endif
 

-#include "wx/stubs/colordlg.h"
+#include "wx/wxprec.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)
 #endif
 
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 #endif
 

+#include "wx/mac/private.h"
+#ifndef __DARWIN__
+#include <ColorPicker.h>
+#endif
+

 /*
  * wxColourDialog
  */
 /*
  * wxColourDialog
  */


@@ -45,9 +56,22 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 
 int wxColourDialog::ShowModal()
 {
 
 int wxColourDialog::ShowModal()
 {

-    /* TODO: implement dialog
-     */
+    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 ))
+    {
+        m_colourData.m_dataColour.Set( (WXCOLORREF*) &newColor ) ;
+        return wxID_OK;
+    }
+    else
+    {
+        return wxID_CANCEL;
+    }

 
     return wxID_CANCEL;
 }
 
 
     return wxID_CANCEL;
 }
 

+#endif