Add wxEVT_AUI_PANE_ACTIVATED event.

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

diff --git a/src/generic/clrpickerg.cpp b/src/generic/clrpickerg.cpp
index 80de3e15a64d06b34a107e1c1235a2b8e10e8361..ffc71547ad4e53d07df063f747eb873c76ec17b9 100644 (file)
--- a/src/generic/clrpickerg.cpp
+++ b/src/generic/clrpickerg.cpp
@@ -58,7 +58,7 @@ bool wxGenericColourButton::Create( wxWindow *parent, wxWindowID id,
     }
 
     // and handle user clicks on it
-    Connect(wxEVT_COMMAND_BUTTON_CLICKED,
+    Connect(GetId(), wxEVT_COMMAND_BUTTON_CLICKED,
             wxCommandEventHandler(wxGenericColourButton::OnButtonClick),
             NULL, this);
 
@@ -83,7 +83,7 @@ void wxGenericColourButton::InitColourData()
 
 void wxGenericColourButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
 {
-    // update the wxColouData to be shown in the the dialog
+    // update the wxColouData to be shown in the dialog
     ms_data.SetColour(m_colour);
 
     // create the colour dialog and display it
@@ -105,15 +105,15 @@ void wxGenericColourButton::UpdateColour()
     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.SetBrush( wxBrush(m_colour) );
     dc.DrawRectangle( 0,0,m_bitmap.GetWidth(),m_bitmap.GetHeight() );
-    
-//    if ( HasFlag(wxCLRP_SHOW_LABEL) )
+
+    if ( HasFlag(wxCLRP_SHOW_LABEL) )
     {
         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 );
 }