Hopefully fixed library names generated by wx-config for OS/2's PM port.

[wxWidgets.git] / include / wx / motif / control.h

diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h
index 33e5fcf5096874a72fd888b214b126c56c961d2d..9fde5ab45423864f8d5aa55060333d84afac4cec 100644 (file)
--- 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(NO_GCC_PRAGMA)
 #pragma interface "control.h"
 #endif
 
@@ -44,22 +44,16 @@ public:
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxControlNameStr);
     
-    // simulates the event, returns TRUE if the event was processed
+    // simulates the event, returns true if the event was processed
     virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
     
-    // calls the callback and appropriate event handlers, returns TRUE if
+    // calls the callback and appropriate event handlers, returns true if
     // event was processed
     virtual bool ProcessCommand(wxCommandEvent& event);
     
     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:
@@ -73,15 +67,14 @@ protected:
                        const wxValidator& validator,
                        const wxString& name);
 
-#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
+    // native implementation using XtQueryGeometry
+    virtual wxSize DoGetBestSize() const;
+
+    // Motif: prevent callbacks being called while in SetValue
+    bool m_inSetValue;
     
     DECLARE_EVENT_TABLE()
 };
 
-#endif
-// _WX_CONTROL_H_
+#endif // _WX_CONTROL_H_
+