Distrib changes.

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

diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h
index 4913175b7154786676bab315f46635d1d6230e53..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_
@@ -23,27 +23,39 @@
 // General item class
 class WXDLLEXPORT wxControl: public wxWindow
 {
-  DECLARE_ABSTRACT_CLASS(wxControl)
+    DECLARE_ABSTRACT_CLASS(wxControl)
+
 public:
-   wxControl();
-   ~wxControl();
+    wxControl();
+    ~wxControl();
+
+    // 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 Command(wxCommandEvent& WXUNUSED(event)) {};        // Simulates an event
-   virtual void ProcessCommand(wxCommandEvent& event); // Calls the callback and
-                                                                 // appropriate event handlers
-   virtual void SetLabel(const wxString& label);
-   virtual wxString GetLabel() const ;
+    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
 
-   inline wxFunction GetCallback() { return m_callback; }
+    wxFunction GetCallback() { return m_callback; }
+#endif // WXWIN_COMPATIBILITY
+
+    bool InSetValue() const { return m_inSetValue; }
 
 protected:
-   wxFunction       m_callback;     // Callback associated with the window
+#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
 
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
 #endif