Do not #undef wxNEED_PRINTF_CONVERSION if wxVsnprintf_ has not been defined

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

diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index dafa83279d496c5f23af6f33206452e8d9cbbba3..9bb9477eb13a76346d2ff41d7815f914ee98d51e 100644 (file)
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -55,14 +55,16 @@ public:
     // ctors and create functions
     // ---------------------------
 
-    wxWindow();
+    wxWindow() { Init(); }
 
     wxWindow(wxWindow *parent,
              wxWindowID id,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
-             const wxString& name = wxPanelNameStr);
+             const wxString& name = wxPanelNameStr)
+        : wxWindowNative(parent, id, pos, size, style | wxCLIP_CHILDREN, name)
+        { Init(); }
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -204,7 +206,7 @@ protected:
 
     // event handlers
     void OnSize(wxSizeEvent& event);
-    void OnNcPaint(wxPaintEvent& event);
+    void OnNcPaint(wxNcPaintEvent& event);
     void OnPaint(wxPaintEvent& event);
     void OnErase(wxEraseEvent& event);
 
@@ -259,7 +261,7 @@ protected:
 
 #ifdef __WXMSW__
     // override MSWWindowProc() to process WM_NCHITTEST
-    long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 #endif // __WXMSW__
 
 private: