X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4294b7832a5aed3c1cccc06aecd227d43da8830..39ae1f1392ded3c444e952709485338437125e16:/include/wx/motif/control.h?ds=sidebyside

diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h
index a40687a118..9fde5ab454 100644
--- a/include/wx/motif/control.h
+++ b/include/wx/motif/control.h
@@ -6,13 +6,13 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "control.h"
 #endif
 
@@ -21,34 +21,60 @@
 #include "wx/validate.h"
 
 // General item class
-class WXDLLEXPORT wxControl: public wxWindow
+class WXDLLEXPORT wxControl: public wxControlBase
 {
     DECLARE_ABSTRACT_CLASS(wxControl)
+        
 public:
     wxControl();
-    ~wxControl();
-
-    virtual void Command(wxCommandEvent& WXUNUSED(event)) {};        // Simulates an event
-    virtual void ProcessCommand(wxCommandEvent& event); // Calls the callback and
-                                                                 // appropriate event handlers
+    wxControl( wxWindow *parent,
+        wxWindowID id,
+        const wxPoint &pos = wxDefaultPosition,
+        const wxSize &size = wxDefaultSize,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString &name = wxControlNameStr )
+    {
+        Create(parent, id, pos, size, style, validator, name);
+    }
+    
+    bool Create(wxWindow *parent, wxWindowID id,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxControlNameStr);
+    
+    // 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
+    // event was processed
+    virtual bool ProcessCommand(wxCommandEvent& event);
+    
     virtual void SetLabel(const wxString& label);
     virtual wxString GetLabel() const ;
-
-    // Places item in centre of panel - so can't be used BEFORE panel->Fit()
-    void Centre(int direction = wxHORIZONTAL);
-    inline void Callback(const wxFunction function) { m_callback = function; }; // Adds callback
-
-    inline wxFunction GetCallback() { return m_callback; }
-
-    inline bool InSetValue() const { return m_inSetValue; }
+    
+    bool InSetValue() const { return m_inSetValue; }
+    
 protected:
-    wxFunction          m_callback;     // Callback associated with the window
+    // 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);
 
-    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_
+