Derive wxBitmapButton from wxBitmapButtonBase + misc cleanup.

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

diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h
index d96d569a46dc26982f736da61354796a8e99ff64..8dc7e270f09e31dfce469a2e4d3145a5368dacad 100644 (file)
--- a/include/wx/motif/control.h
+++ b/include/wx/motif/control.h
@@ -20,43 +20,70 @@
 #include "wx/list.h"
 #include "wx/validate.h"
 
+#define wxControlNameStr _T("control")
+
 // General item class
-class WXDLLEXPORT wxControl: public wxWindow
+class WXDLLEXPORT wxControl: public wxControlBase
 {
     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
     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 ;
-
+    
 #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:
+    // 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);
+
 #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
-
+    // in SetValue
+    
     DECLARE_EVENT_TABLE()
 };
 
 #endif
-    // _WX_CONTROL_H_
+// _WX_CONTROL_H_