Ensure that Enter key presses are never stolen from wxButton in wxMSW.

[wxWidgets.git] / src / gtk / colour.cpp

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index ff2b953c97ce14b07ddba8b44d25100162b393e4..185cb5c1d4c77fddc9ecc792cb20a4f36675fb5d 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -52,7 +52,7 @@ public:
     guint16 m_blue;
     wxByte m_alpha;
 
     guint16 m_blue;
     wxByte m_alpha;
 

-    DECLARE_NO_COPY_CLASS(wxColourRefData)
+    wxDECLARE_NO_COPY_CLASS(wxColourRefData);

 };
 
 void wxColourRefData::FreeColour()
 };
 
 void wxColourRefData::FreeColour()


@@ -88,8 +88,6 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
 // GDK's values are in 0..65535 range, ours are in 0..255
 #define SHIFT  8
 
 // GDK's values are in 0..65535 range, ours are in 0..255
 #define SHIFT  8
 

-IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
-

 wxColour::wxColour(const GdkColor& gdkColor)
 {
     m_refData = new wxColourRefData(gdkColor.red, gdkColor.green, gdkColor.blue);
 wxColour::wxColour(const GdkColor& gdkColor)
 {
     m_refData = new wxColourRefData(gdkColor.red, gdkColor.green, gdkColor.blue);


@@ -129,49 +127,49 @@ void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char bl
 
 unsigned char wxColour::Red() const
 {
 
 unsigned char wxColour::Red() const
 {

-    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );

 
     return wxByte(M_COLDATA->m_red >> SHIFT);
 }
 
 unsigned char wxColour::Green() const
 {
 
     return wxByte(M_COLDATA->m_red >> SHIFT);
 }
 
 unsigned char wxColour::Green() const
 {

-    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );

 
     return wxByte(M_COLDATA->m_green >> SHIFT);
 }
 
 unsigned char wxColour::Blue() const
 {
 
     return wxByte(M_COLDATA->m_green >> SHIFT);
 }
 
 unsigned char wxColour::Blue() const
 {

-    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );

 
     return wxByte(M_COLDATA->m_blue >> SHIFT);
 }
 
 unsigned char wxColour::Alpha() const
 {
 
     return wxByte(M_COLDATA->m_blue >> SHIFT);
 }
 
 unsigned char wxColour::Alpha() const
 {

-    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );

 
     return M_COLDATA->m_alpha;
 }
 
 void wxColour::CalcPixel( GdkColormap *cmap )
 {
 
     return M_COLDATA->m_alpha;
 }
 
 void wxColour::CalcPixel( GdkColormap *cmap )
 {

-    if (!Ok()) return;
+    if (!IsOk()) return;

 
     M_COLDATA->AllocColour( cmap );
 }
 
 int wxColour::GetPixel() const
 {
 
     M_COLDATA->AllocColour( cmap );
 }
 
 int wxColour::GetPixel() const
 {

-    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );

 
     return M_COLDATA->m_color.pixel;
 }
 
 const GdkColor *wxColour::GetColor() const
 {
 
     return M_COLDATA->m_color.pixel;
 }
 
 const GdkColor *wxColour::GetColor() const
 {

-    wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") );
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid colour") );

 
     return &M_COLDATA->m_color;
 }
 
     return &M_COLDATA->m_color;
 }