X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..75d3838010e2d8a9592a4a016e2994f4f0d3070b:/include/wx/motif/control.h

diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h
index b029556632..84afdf5eae 100644
--- a/include/wx/motif/control.h
+++ b/include/wx/motif/control.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "control.h"
 #endif
 
@@ -20,8 +20,6 @@
 #include "wx/list.h"
 #include "wx/validate.h"
 
-#define wxControlNameStr _T("control")
-
 // General item class
 class WXDLLEXPORT wxControl: public wxControlBase
 {
@@ -56,24 +54,24 @@ public:
     virtual void SetLabel(const wxString& label);
     virtual wxString GetLabel() const ;
     
-#if WXWIN_COMPATIBILITY
-    void Callback(const wxFunction function) { m_callback = function; }; // Adds callback
-    
-    wxFunction GetCallback() { return m_callback; }
-#endif // WXWIN_COMPATIBILITY
-    
     bool InSetValue() const { return m_inSetValue; }
     
 protected:
-#if WXWIN_COMPATIBILITY
-    wxFunction          m_callback;     // Callback associated with the window
-#endif // WXWIN_COMPATIBILITY
-    
-    bool                m_inSetValue;   // Motif: prevent callbacks being called while
-    // in SetValue
+    // calls wxControlBase::CreateControl, also sets foreground, background and
+    // font to parent's values
+    bool CreateControl(wxWindow *parent,
+                       wxWindowID id,
+                       const wxPoint& pos,
+                       const wxSize& size,
+                       long style,
+                       const wxValidator& validator,
+                       const wxString& name);
+
+    // Motif: prevent callbacks being called while in SetValue
+    bool m_inSetValue;
     
     DECLARE_EVENT_TABLE()
 };
 
-#endif
-// _WX_CONTROL_H_
+#endif // _WX_CONTROL_H_
+