[ 1598659 ] make wxAnimationCtrl::SetInactiveBitmap center given bitmap

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

diff --git a/src/generic/clrpickerg.cpp b/src/generic/clrpickerg.cpp
index c6fc40bb4bf835014c5d00d8b67020659cf8b204..717b1811ae0700abe188fd2eedc487f06d30b7f7 100644 (file)
--- a/src/generic/clrpickerg.cpp
+++ b/src/generic/clrpickerg.cpp
@@ -24,11 +24,10 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-    #include "wx/window.h"
-#endif //WX_PRECOMP
+#if wxUSE_COLOURPICKERCTRL

 
 #include "wx/clrpicker.h"
 
 #include "wx/clrpicker.h"

+

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


@@ -36,8 +35,6 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-#if wxUSE_COLOURPICKERCTRL
-

 wxColourData wxGenericColourButton::ms_data;
 IMPLEMENT_DYNAMIC_CLASS(wxGenericColourButton, wxButton)
 
 wxColourData wxGenericColourButton::ms_data;
 IMPLEMENT_DYNAMIC_CLASS(wxGenericColourButton, wxButton)
 


@@ -73,10 +70,11 @@ bool wxGenericColourButton::Create( wxWindow *parent, wxWindowID id,
 void wxGenericColourButton::InitColourData()
 {
     ms_data.SetChooseFull(true);
 void wxGenericColourButton::InitColourData()
 {
     ms_data.SetChooseFull(true);

-    for (int i = 0; i < 16; i++)
+    unsigned char grey = 0;
+    for (int i = 0; i < 16; i++, grey += 16)

     {
         // fill with grey tones the custom colors palette
     {
         // fill with grey tones the custom colors palette

-        wxColour colour(i*16, i*16, i*16);
+        wxColour colour(grey, grey, grey);

         ms_data.SetCustomColour(i, colour);
     }
 }
         ms_data.SetCustomColour(i, colour);
     }
 }


@@ -119,4 +117,16 @@ void wxGenericColourButton::UpdateColour()
         SetLabel(m_colour.GetAsString(wxC2S_HTML_SYNTAX));
 }
 
         SetLabel(m_colour.GetAsString(wxC2S_HTML_SYNTAX));
 }
 

+wxSize wxGenericColourButton::DoGetBestSize() const
+{
+    wxSize sz(wxButton::DoGetBestSize());
+    if ( HasFlag(wxCLRP_SHOW_LABEL) )
+        return sz;
+
+    // if we have no label, then make this button a square
+    // (like e.g. native GTK version of this control)
+    sz.SetWidth(sz.GetHeight());
+    return sz;
+}
+

 #endif      // wxUSE_COLOURPICKERCTRL
 #endif      // wxUSE_COLOURPICKERCTRL