file should end with newline

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

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 73f3856f0dd8852c5bf5f72a1ca546fca35e882d..c218411d0500b0865b5ef6cda404dcf76f0b75bc 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -20,7 +20,7 @@
     #pragma interface "window.h"
 #endif
 
-#include "wx/msw/winundef.h"
+// #include "wx/msw/winundef.h"
 
 // VZ: apparently some version of Windows send extra mouse move messages after
 //     a mouse click. My tests under NT 4.0 and 95 didn't show it so I'm
@@ -144,13 +144,16 @@ public:
     virtual void OnDefaultAction(wxControl * WXUNUSED(initiatingItem)) { }
 #endif // WXWIN_COMPATIBILITY
 
-    // caret manipulation (MSW only)
-    virtual void CreateCaret(int w, int h);
-    virtual void CreateCaret(const wxBitmap *bitmap);
-    virtual void DestroyCaret();
-    virtual void ShowCaret(bool show);
-    virtual void SetCaretPos(int x, int y);
-    virtual void GetCaretPos(int *x, int *y) const;
+#if wxUSE_CARET && WXWIN_COMPATIBILITY
+    // caret manipulation (old MSW only functions, see wxCaret class for the
+    // new API)
+    void CreateCaret(int w, int h);
+    void CreateCaret(const wxBitmap *bitmap);
+    void DestroyCaret();
+    void ShowCaret(bool show);
+    void SetCaretPos(int x, int y);
+    void GetCaretPos(int *x, int *y) const;
+#endif // wxUSE_CARET
 
     // Native resource loading (implemented in src/msw/nativdlg.cpp)
     // FIXME: should they really be all virtual?
@@ -213,12 +216,12 @@ public:
     // returns TRUE if the window has been created
     bool MSWCreate(int id,
                    wxWindow *parent,
-                   const char *wclass,
+                   const wxChar *wclass,
                    wxWindow *wx_win,
-                   const char *title,
+                   const wxChar *title,
                    int x, int y, int width, int height,
                    WXDWORD style,
-                   const char *dialog_template = NULL,
+                   const wxChar *dialog_template = NULL,
                    WXDWORD exendedStyle = 0);
     virtual bool MSWCommand(WXUINT param, WXWORD id);
 
@@ -374,12 +377,6 @@ protected:
     bool                  m_doubleClickAllowed:1;
     bool                  m_winCaptured:1;
 
-    // Caret data
-    bool                  m_caretEnabled:1;
-    bool                  m_caretShown:1;
-    int                   m_caretWidth;
-    int                   m_caretHeight;
-
     // the size of one page for scrolling
     int                   m_xThumbSize;
     int                   m_yThumbSize;