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 84afdf5eaeb6856c08d4649c29230c150aff7ac6..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_
 
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 

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

 #pragma interface "control.h"
 #endif
 
 #pragma interface "control.h"
 #endif
 


@@ -44,10 +44,10 @@ public:
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxControlNameStr);
     
         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)) { }
     
     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);
     
     // event was processed
     virtual bool ProcessCommand(wxCommandEvent& event);
     


@@ -67,6 +67,9 @@ protected:
                        const wxValidator& validator,
                        const wxString& name);
 
                        const wxValidator& validator,
                        const wxString& name);
 

+    // native implementation using XtQueryGeometry
+    virtual wxSize DoGetBestSize() const;
+

     // Motif: prevent callbacks being called while in SetValue
     bool m_inSetValue;
     
     // Motif: prevent callbacks being called while in SetValue
     bool m_inSetValue;