added length argument to wxString::wxString(wchar_t*), just like in case of wxChar...

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

diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h
index 443290b339a6e8e1d132b1bf185f28d10981a6cd..0e3d3c0af8d1c4f234c93ab238c6e3d94360b066 100644 (file)
--- a/include/wx/motif/window.h
+++ b/include/wx/motif/window.h
@@ -24,8 +24,6 @@
 
 class wxWindow : public wxWindowBase
 {
-DECLARE_DYNAMIC_CLASS(wxWindow)
-
 friend class WXDLLEXPORT wxDC;
 friend class WXDLLEXPORT wxWindowDC;
 
@@ -33,11 +31,11 @@ public:
     wxWindow() { Init(); }
 
     wxWindow(wxWindow *parent,
-             wxWindowID id,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             long style = 0,
-             const wxString& name = wxPanelNameStr)
+            wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = 0,
+            const wxString& name = wxPanelNameStr)
     {
         Init();
         Create(parent, id, pos, size, style, name);
@@ -65,8 +63,6 @@ public:
     virtual void SetFocus();
 
     virtual void WarpPointer(int x, int y);
-    virtual void CaptureMouse();
-    virtual void ReleaseMouse();
 
     virtual void Refresh( bool eraseBackground = TRUE,
                           const wxRect *rect = (const wxRect *) NULL );
@@ -319,6 +315,9 @@ protected:
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual bool DoPopupMenu(wxMenu *menu, int x, int y);
 
+    virtual void DoCaptureMouse();
+    virtual void DoReleaseMouse();
+
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );
 #endif // wxUSE_TOOLTIPS
@@ -327,7 +326,8 @@ private:
     // common part of all ctors
     void Init();
 
-    DECLARE_NO_COPY_CLASS(wxWindow);
+    DECLARE_DYNAMIC_CLASS(wxWindow)
+    DECLARE_NO_COPY_CLASS(wxWindow)
     DECLARE_EVENT_TABLE()
 };