Added DECLARE_LOCAL_EVENT_TYPE which doesn't use WXDLLEXPORT. This is

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

diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h
index a40687a1189fa75ea61de71abc396594ea78e6e4..e6f8a9acca7fe7495e236b203f4ac6b5ef8b180e 100644 (file)
--- a/include/wx/motif/control.h
+++ b/include/wx/motif/control.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTROL_H_
@@ -20,29 +20,56 @@
 #include "wx/list.h"
 #include "wx/validate.h"
 
+#define wxControlNameStr _T("control")
+
 // General item class
-class WXDLLEXPORT wxControl: public wxWindow
+class WXDLLEXPORT wxControl: public wxControlBase
 {
     DECLARE_ABSTRACT_CLASS(wxControl)
+
 public:
     wxControl();
+    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);
+
     ~wxControl();
 
-    virtual void Command(wxCommandEvent& WXUNUSED(event)) {};        // Simulates an event
-    virtual void ProcessCommand(wxCommandEvent& event); // Calls the callback and
-                                                                 // appropriate event handlers
+    // 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
+#if WXWIN_COMPATIBILITY
+    void Callback(const wxFunction function) { m_callback = function; }; // Adds callback
+
+    wxFunction GetCallback() { return m_callback; }
+#endif // WXWIN_COMPATIBILITY
 
-    inline wxFunction GetCallback() { return m_callback; }
+    bool InSetValue() const { return m_inSetValue; }
 
-    inline 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