Richtext interface fixes and additions for Phoenix

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

diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h
index d96d569a46dc26982f736da61354796a8e99ff64..a212c38f56c63598f778f9c4c5ba768a42dd13bf 100644 (file)
--- a/include/wx/motif/control.h
+++ b/include/wx/motif/control.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        control.h
+// Name:        wx/motif/control.h

 // Purpose:     wxControl class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxControl class
 // Author:      Julian Smart
 // Modified by:


@@ -12,51 +12,64 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 

-#ifdef __GNUG__
-#pragma interface "control.h"
-#endif
-

 #include "wx/window.h"
 #include "wx/list.h"
 #include "wx/validate.h"
 
 // General item class
 #include "wx/window.h"
 #include "wx/list.h"
 #include "wx/validate.h"
 
 // General item class

-class WXDLLEXPORT wxControl: public wxWindow
+class WXDLLIMPEXP_CORE wxControl: public wxControlBase

 {
     DECLARE_ABSTRACT_CLASS(wxControl)
 
 public:
     wxControl();
 {
     DECLARE_ABSTRACT_CLASS(wxControl)
 
 public:
     wxControl();

-    ~wxControl();
+    wxControl( wxWindow *parent,
+        wxWindowID id,
+        const wxPoint &pos = wxDefaultPosition,
+        const wxSize &size = wxDefaultSize,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString &name = wxControlNameStr )
+    {
+        Create(parent, id, pos, size, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent, wxWindowID id,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxControlNameStr);

 
 

-    // simulates the event, returns TRUE if the event was processed
+    // simulates the event, returns true if the event was processed

     virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
 
     virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
 

-    // calls the callback and appropriate event handlers, returns TRUE if
+    // 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 ;
 
     // event was processed
     virtual bool ProcessCommand(wxCommandEvent& event);
 
     virtual void SetLabel(const wxString& label);
     virtual wxString GetLabel() const ;
 

-#if WXWIN_COMPATIBILITY
-    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
-#endif // WXWIN_COMPATIBILITY
+    // calls wxControlBase::CreateControl, also sets foreground, background and
+    // font to parent's values
+    bool CreateControl(wxWindow *parent,
+                       wxWindowID id,
+                       const wxPoint& pos,
+                       const wxSize& size,
+                       long style,
+                       const wxValidator& validator,
+                       const wxString& name);
+
+    // native implementation using XtQueryGeometry
+    virtual wxSize DoGetBestSize() const;

 
 

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

 
     DECLARE_EVENT_TABLE()
 };
 
 
     DECLARE_EVENT_TABLE()
 };
 

-#endif
-    // _WX_CONTROL_H_
+#endif // _WX_CONTROL_H_