Return NULL from wxWindow::GetCapture() when the capture is being lost.

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

diff --git a/src/generic/clrpickerg.cpp b/src/generic/clrpickerg.cpp
index 843dc86750e47bf8331c4da6bea9fac1fcda0fd3..b76115f04a72d2da78f5303bf0c0da12d198b62c 100644 (file)
--- a/src/generic/clrpickerg.cpp
+++ b/src/generic/clrpickerg.cpp
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi (readapted code written by Vadim Zeitlin)
 // Modified by:
 // Created:     15/04/2006
 // Author:      Francesco Montorsi (readapted code written by Vadim Zeitlin)
 // Modified by:
 // Created:     15/04/2006

-// RCS-ID:      $Id$

 // Copyright:   (c) Vadim Zeitlin, Francesco Montorsi
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Vadim Zeitlin, Francesco Montorsi
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -58,7 +57,7 @@ bool wxGenericColourButton::Create( wxWindow *parent, wxWindowID id,
     }
 
     // and handle user clicks on it
     }
 
     // and handle user clicks on it

-    Connect(wxEVT_COMMAND_BUTTON_CLICKED,
+    Connect(GetId(), wxEVT_BUTTON,

             wxCommandEventHandler(wxGenericColourButton::OnButtonClick),
             NULL, this);
 
             wxCommandEventHandler(wxGenericColourButton::OnButtonClick),
             NULL, this);
 


@@ -83,7 +82,7 @@ void wxGenericColourButton::InitColourData()
 
 void wxGenericColourButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
 {
 
 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
     ms_data.SetColour(m_colour);
 
     // create the colour dialog and display it


@@ -105,7 +104,7 @@ void wxGenericColourButton::UpdateColour()
     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.SetBrush( wxBrush(m_colour) );
     dc.DrawRectangle( 0,0,m_bitmap.GetWidth(),m_bitmap.GetHeight() );
     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.SetBrush( wxBrush(m_colour) );
     dc.DrawRectangle( 0,0,m_bitmap.GetWidth(),m_bitmap.GetHeight() );

-    
+

     if ( HasFlag(wxCLRP_SHOW_LABEL) )
     {
         wxColour col( ~m_colour.Red(), ~m_colour.Green(), ~m_colour.Blue() );
     if ( HasFlag(wxCLRP_SHOW_LABEL) )
     {
         wxColour col( ~m_colour.Red(), ~m_colour.Green(), ~m_colour.Blue() );


@@ -113,7 +112,7 @@ void wxGenericColourButton::UpdateColour()
         dc.SetFont( GetFont() );
         dc.DrawText( m_colour.GetAsString(wxC2S_HTML_SYNTAX), 0, 0 );
     }
         dc.SetFont( GetFont() );
         dc.DrawText( m_colour.GetAsString(wxC2S_HTML_SYNTAX), 0, 0 );
     }

-    
+

     dc.SelectObject( wxNullBitmap );
     SetBitmapLabel( m_bitmap );
 }
     dc.SelectObject( wxNullBitmap );
     SetBitmapLabel( m_bitmap );
 }