Helps Borland compile further in Unicode mode.

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

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 3e2ac99f30714d5533eb8e3863c056fe61a267a3..3a5e837044764ee074690651af834cf3ea6f5183 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -78,7 +78,7 @@ class WXDLLEXPORT wxResourceTable;
 class WXDLLEXPORT wxItemResource;
 #endif
 
-WXDLLEXPORT_DATA(extern const char*) wxPanelNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 
 WXDLLEXPORT_DATA(extern const wxSize) wxDefaultSize;
 WXDLLEXPORT_DATA(extern const wxPoint) wxDefaultPosition;
@@ -667,8 +667,8 @@ public:
 
     // These return TRUE if an event handler was found, FALSE otherwise (not processed)
     virtual bool MSWOnChar(WXWORD wParam, WXLPARAM lParam, bool isASCII = FALSE);
-    virtual bool MSWOnKeyDown(WXWORD wParam, WXLPARAM lParam, bool isASCII = FALSE);
-    virtual bool MSWOnKeyUp(WXWORD wParam, WXLPARAM lParam, bool isASCII = FALSE);
+    virtual bool MSWOnKeyDown(WXWORD wParam, WXLPARAM lParam);
+    virtual bool MSWOnKeyUp(WXWORD wParam, WXLPARAM lParam);
 
     virtual bool MSWOnActivate(int flag, bool minimized, WXHWND activate);
     virtual long MSWOnMDIActivate(long flag, WXHWND activate, WXHWND deactivate);
@@ -874,7 +874,7 @@ inline bool wxWindow::IsBeingDeleted() { return m_isBeingDeleted; }
 // Window specific (so far)
 WXDLLEXPORT wxWindow* wxGetActiveWindow();
 
-WXDLLEXPORT_DATA(extern wxList) wxTopLevelWindows;
+WXDLLEXPORT_DATA(extern wxWindowList) wxTopLevelWindows;
 
 WXDLLEXPORT int wxCharCodeMSWToWX(int keySym);
 WXDLLEXPORT int wxCharCodeWXToMSW(int id, bool *IsVirtual);