Warning fixes after char->wxChar in wxVariant.

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

diff --git a/include/wx/univ/control.h b/include/wx/univ/control.h
index 2a903039ac0c3ea47d0a4c021c002cff9186554c..bd34f2eb761b9212859a0aa98e3b292bb6efa919 100644 (file)
--- a/include/wx/univ/control.h
+++ b/include/wx/univ/control.h
@@ -12,10 +12,6 @@
 #ifndef _WX_UNIV_CONTROL_H_
 #define _WX_UNIV_CONTROL_H_
 
 #ifndef _WX_UNIV_CONTROL_H_
 #define _WX_UNIV_CONTROL_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "control.h"
-#endif
-

 class WXDLLEXPORT wxControlRenderer;
 class WXDLLEXPORT wxInputHandler;
 class WXDLLEXPORT wxRenderer;
 class WXDLLEXPORT wxControlRenderer;
 class WXDLLEXPORT wxInputHandler;
 class WXDLLEXPORT wxRenderer;


@@ -45,14 +41,19 @@ typedef wxString wxControlAction;
 class WXDLLEXPORT wxControl : public wxControlBase, public wxInputConsumer
 {
 public:
 class WXDLLEXPORT wxControl : public wxControlBase, public wxInputConsumer
 {
 public:

-    wxControl();
+    wxControl() { Init(); }

 
     wxControl(wxWindow *parent,
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize, long style = 0,
               const wxValidator& validator = wxDefaultValidator,
 
     wxControl(wxWindow *parent,
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize, long style = 0,
               const wxValidator& validator = wxDefaultValidator,

-              const wxString& name = wxControlNameStr);
+              const wxString& name = wxControlNameStr)
+    {
+        Init();
+
+        Create(parent, id, pos, size, style, validator, name);
+    }

 
     bool Create(wxWindow *parent,
                 wxWindowID id,
 
     bool Create(wxWindow *parent,
                 wxWindowID id,