wxMotif should use wxX11 wxPalette instead of duplicating it

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

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 310c2c686195d0a412b4bc313d413d7f2e302c41..0924e49ef4385d181b3db6f0263a15f08cd50f0c 100644 (file)
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        control.cpp
+// Name:        src/motif/control.cpp

 // Purpose:     wxControl class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxControl class
 // Author:      Julian Smart
 // Modified by:


@@ -9,15 +9,15 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "control.h"
-#endif
-
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/control.h"
 
 #include "wx/control.h"

-#include "wx/panel.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/panel.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -27,6 +27,8 @@
 #pragma message enable nosimpint
 #endif
 
 #pragma message enable nosimpint
 #endif
 

+#include "wx/motif/private.h"
+

 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)


@@ -35,14 +37,7 @@ END_EVENT_TABLE()
 // Item members
 wxControl::wxControl()
 {
 // Item members
 wxControl::wxControl()
 {

-    m_backgroundColour = *wxWHITE;
-    m_foregroundColour = *wxBLACK;
-
-#if WXWIN_COMPATIBILITY
-    m_callback = 0;
-#endif // WXWIN_COMPATIBILITY
-
-    m_inSetValue = FALSE;
+    m_inSetValue = false;

 }
 
 bool wxControl::Create( wxWindow *parent,
 }
 
 bool wxControl::Create( wxWindow *parent,


@@ -62,16 +57,19 @@ bool wxControl::Create( wxWindow *parent,
     return ret;
 }
 
     return ret;
 }
 

-wxControl::~wxControl()
+bool wxControl::CreateControl(wxWindow *parent,
+                              wxWindowID id,
+                              const wxPoint& pos,
+                              const wxSize& size,
+                              long style,
+                              const wxValidator& validator,
+                              const wxString& name)

 {
 {

-    // If we delete an item, we should initialize the parent panel,
-    // because it could now be invalid.
-    wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
-    if (panel)
-    {
-        if ( (wxControl *)panel->GetDefaultItem() == this)
-            panel->SetDefaultItem((wxButton*) NULL);
-    }
+    if( !wxControlBase::CreateControl( parent, id, pos, size, style,
+                                       validator, name ) )
+        return false;
+
+    return true;

 }
 
 void wxControl::SetLabel(const wxString& label)
 }
 
 void wxControl::SetLabel(const wxString& label)


@@ -80,14 +78,12 @@ void wxControl::SetLabel(const wxString& label)
     if (!widget)
         return;
 
     if (!widget)
         return;
 

-    wxStripMenuCodes((char*) (const char*) label, wxBuffer);
+    wxXmString label_str(GetLabelText(label));

 
 

-    XmString text = XmStringCreateSimple (wxBuffer);

     XtVaSetValues (widget,
     XtVaSetValues (widget,

-        XmNlabelString, text,
+        XmNlabelString, label_str(),

         XmNlabelType, XmSTRING,
         NULL);
         XmNlabelType, XmSTRING,
         NULL);

-    XmStringFree (text);

 }
 
 wxString wxControl::GetLabel() const
 }
 
 wxString wxControl::GetLabel() const


@@ -96,37 +92,28 @@ wxString wxControl::GetLabel() const
     if (!widget)
         return wxEmptyString;
 
     if (!widget)
         return wxEmptyString;
 

-    XmString text;
-    char *s;
+    XmString text = NULL;

     XtVaGetValues (widget,
         XmNlabelString, &text,
         NULL);
 
     XtVaGetValues (widget,
         XmNlabelString, &text,
         NULL);
 

-    if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
-    {
-        wxString str(s);
-        XtFree (s);
-        XmStringFree(text);
-        return str;
-    }
-    else
-    {
-      //        XmStringFree(text);
-        return wxEmptyString;
-    }
+    return wxXmStringToString( text );

 }
 
 bool wxControl::ProcessCommand(wxCommandEvent & event)
 {
 }
 
 bool wxControl::ProcessCommand(wxCommandEvent & event)
 {

-#if WXWIN_COMPATIBILITY
-    if ( m_callback )
-    {
-        (void)(*m_callback)(this, event);
+    return HandleWindowEvent(event);
+}
+
+wxSize wxControl::DoGetBestSize() const
+{
+    Widget w = (Widget)GetTopWidget();
+
+    // Do not return any arbitrary default value...
+    wxASSERT_MSG (w, wxT("DoGetBestSize called before creation"));

 
 

-        return TRUE;
-    }
-    else
-#endif // WXWIN_COMPATIBILITY
+    XtWidgetGeometry preferred;
+    XtQueryGeometry (w, NULL, &preferred);

 
 

-    return GetEventHandler()->ProcessEvent(event);
+    return wxSize(preferred.width, preferred.height);

 }
 }