Add some "USE" defs that were missing.

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

diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h
index 7eef8e4bc060b0da1e04569a2748017719e6e1cc..9662c06ad157b89c5038bccb2d085b7948631788 100644 (file)
--- a/include/wx/motif/control.h
+++ b/include/wx/motif/control.h
@@ -20,6 +20,8 @@
 #include "wx/list.h"
 #include "wx/validate.h"
 
 #include "wx/list.h"
 #include "wx/validate.h"
 

+#define wxControlNameStr _T("control")
+

 // General item class
 class WXDLLEXPORT wxControl: public wxWindow
 {
 // General item class
 class WXDLLEXPORT wxControl: public wxWindow
 {


@@ -27,24 +29,46 @@ class WXDLLEXPORT wxControl: public wxWindow
 
 public:
     wxControl();
 
 public:
     wxControl();

+    wxControl( wxWindow *parent,
+               wxWindowID id,
+               const wxPoint &pos = wxDefaultPosition,
+               const wxSize &size = wxDefaultSize,
+               long style = 0,
+               const wxString &name = wxControlNameStr );
+
+#if wxUSE_VALIDATORS
+    wxControl( wxWindow *parent,
+               wxWindowID id,
+               const wxPoint &pos = wxDefaultPosition,
+               const wxSize &size = wxDefaultSize,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               const wxString &name = wxControlNameStr );
+#endif

     ~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 ;
 
     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);
+#if WXWIN_COMPATIBILITY

     void Callback(const wxFunction function) { m_callback = function; }; // Adds callback
 
     wxFunction GetCallback() { return m_callback; }
     void Callback(const wxFunction function) { m_callback = function; }; // Adds callback
 
     wxFunction GetCallback() { return m_callback; }

+#endif // WXWIN_COMPATIBILITY

 
     bool InSetValue() const { return m_inSetValue; }
 
 protected:
 
     bool InSetValue() const { return m_inSetValue; }
 
 protected:

+#if WXWIN_COMPATIBILITY

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

+#endif // WXWIN_COMPATIBILITY

 
     bool                m_inSetValue;   // Motif: prevent callbacks being called while
                                         // in SetValue
 
     bool                m_inSetValue;   // Motif: prevent callbacks being called while
                                         // in SetValue