remove leading dots from .ini/.conf in AddConfFileExtIfNeeded() as this results in...

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

diff --git a/src/generic/clrpickerg.cpp b/src/generic/clrpickerg.cpp
index 4e2a86b32cc129480bd9fcc1d15b200495d653d1..843dc86750e47bf8331c4da6bea9fac1fcda0fd3 100644 (file)
--- a/src/generic/clrpickerg.cpp
+++ b/src/generic/clrpickerg.cpp
@@ -27,8 +27,8 @@
 #if wxUSE_COLOURPICKERCTRL
 
 #include "wx/clrpicker.h"
-
 #include "wx/colordlg.h"
+#include "wx/dcmemory.h"
 
 
 // ============================================================================
@@ -51,7 +51,7 @@ bool wxGenericColourButton::Create( wxWindow *parent, wxWindowID id,
 
     // create this button
     if (!wxBitmapButton::Create( parent, id, m_bitmap, pos,
-                           size, style, validator, name ))
+                           size, style | wxBU_AUTODRAW, validator, name ))
     {
         wxFAIL_MSG( wxT("wxGenericColourButton creation failed") );
         return false;
@@ -105,19 +105,27 @@ void wxGenericColourButton::UpdateColour()
     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.SetBrush( wxBrush(m_colour) );
     dc.DrawRectangle( 0,0,m_bitmap.GetWidth(),m_bitmap.GetHeight() );
-    dc.SelectObject( wxNullBitmap );
-    SetBitmapLabel( m_bitmap );
     
-#if 0
     if ( HasFlag(wxCLRP_SHOW_LABEL) )
-        SetLabel(m_colour.GetAsString(wxC2S_HTML_SYNTAX));
-#endif
+    {
+        wxColour col( ~m_colour.Red(), ~m_colour.Green(), ~m_colour.Blue() );
+        dc.SetTextForeground( col );
+        dc.SetFont( GetFont() );
+        dc.DrawText( m_colour.GetAsString(wxC2S_HTML_SYNTAX), 0, 0 );
+    }
+    
+    dc.SelectObject( wxNullBitmap );
+    SetBitmapLabel( m_bitmap );
 }
 
 wxSize wxGenericColourButton::DoGetBestSize() const
 {
     wxSize sz(wxBitmapButton::DoGetBestSize());
+#ifdef __WXMAC__
     sz.y += 6;
+#else
+    sz.y += 2;
+#endif
     sz.x += 30;
     if ( HasFlag(wxCLRP_SHOW_LABEL) )
         return sz;