compilation fixes, doesn't work yet

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

diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h
index a40687a1189fa75ea61de71abc396594ea78e6e4..d96d569a46dc26982f736da61354796a8e99ff64 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_
@@ -24,25 +24,33 @@
 class WXDLLEXPORT wxControl: public wxWindow
 {
     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
+    // 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