Removed references to DEBUG and WXDEBUG; cured Motif font problem; removed

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

diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h
index 4913175b7154786676bab315f46635d1d6230e53..a40687a1189fa75ea61de71abc396594ea78e6e4 100644 (file)
--- a/include/wx/motif/control.h
+++ b/include/wx/motif/control.h
@@ -23,27 +23,31 @@
 // General item class
 class WXDLLEXPORT wxControl: public wxWindow
 {
-  DECLARE_ABSTRACT_CLASS(wxControl)
+    DECLARE_ABSTRACT_CLASS(wxControl)
 public:
-   wxControl();
-   ~wxControl();
+    wxControl();
+    ~wxControl();
 
-   virtual void Command(wxCommandEvent& WXUNUSED(event)) {};        // Simulates an event
-   virtual void ProcessCommand(wxCommandEvent& event); // Calls the callback and
+    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
+    // 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 wxFunction GetCallback() { return m_callback; }
 
+    inline bool InSetValue() const { return m_inSetValue; }
 protected:
-   wxFunction       m_callback;     // Callback associated with the window
+    wxFunction          m_callback;     // Callback associated with the window
 
-DECLARE_EVENT_TABLE()
+    bool                m_inSetValue;   // Motif: prevent callbacks being called while
+                                        // in SetValue
+
+    DECLARE_EVENT_TABLE()
 };
 
 #endif