Cleanup

[wxWidgets.git] / src / motif / checkbox.cpp

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index cd2b57c5b8ebb814e9dee1a03b47f286983bd377..927b50812357ef5a4996b2a4ff46bb1124dd763e 100644 (file)
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -9,7 +9,7 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "checkbox.h"
 #endif
 
 #pragma implementation "checkbox.h"
 #endif
 


@@ -70,7 +70,6 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 
     XmToggleButtonSetState ((Widget) m_mainWidget, FALSE, TRUE);
 
 
     XmToggleButtonSetState ((Widget) m_mainWidget, FALSE, TRUE);
 

-    SetCanAddEventHandler(TRUE);

     AttachWidget( parent, m_mainWidget, (WXWidget)NULL,
                   pos.x, pos.y, size.x, size.y );
 
     AttachWidget( parent, m_mainWidget, (WXWidget)NULL,
                   pos.x, pos.y, size.x, size.y );
 


@@ -122,7 +121,7 @@ void wxCheckBox::ChangeBackgroundColour()
         XmNforeground, g_itemColors[wxFORE_INDEX].pixel,
         NULL);
 
         XmNforeground, g_itemColors[wxFORE_INDEX].pixel,
         NULL);
 

-    int selectPixel = wxBLACK->AllocColour(wxGetDisplay());
+    int selectPixel = wxBLACK->AllocColour(XtDisplay((Widget)m_mainWidget));

 
     // Better to have the checkbox selection in black, or it's
     // hard to determine what state it is in.
 
     // Better to have the checkbox selection in black, or it's
     // hard to determine what state it is in.