Some #include and #if wxUSE_XX things

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

diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h
index a40687a1189fa75ea61de71abc396594ea78e6e4..7eef8e4bc060b0da1e04569a2748017719e6e1cc 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
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTROL_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTROL_H_


@@ -24,6 +24,7 @@
 class WXDLLEXPORT wxControl: public wxWindow
 {
     DECLARE_ABSTRACT_CLASS(wxControl)
 class WXDLLEXPORT wxControl: public wxWindow
 {
     DECLARE_ABSTRACT_CLASS(wxControl)

+

 public:
     wxControl();
     ~wxControl();
 public:
     wxControl();
     ~wxControl();


@@ -36,11 +37,12 @@ public:
 
     // Places item in centre of panel - so can't be used BEFORE panel->Fit()
     void Centre(int direction = wxHORIZONTAL);
 
     // 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
+    void Callback(const wxFunction function) { m_callback = function; }; // Adds callback
+
+    wxFunction GetCallback() { return m_callback; }

 
 

-    inline wxFunction GetCallback() { return m_callback; }
+    bool InSetValue() const { return m_inSetValue; }

 
 

-    inline bool InSetValue() const { return m_inSetValue; }

 protected:
     wxFunction          m_callback;     // Callback associated with the window
 
 protected:
     wxFunction          m_callback;     // Callback associated with the window