cMB2WX and cWX2MB accepts null pointers.

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

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 4e95ca8b5bcd12acac682dbce9a429abc99696d9..2e2069b41dae8213ff56d94257206a5ebaea4d10 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -84,8 +84,8 @@ typedef signed short int SHORT ;
 #endif
 
 #if wxUSE_PENWIN
-WXDLLEXPORT void wxRegisterPenWin(void);
-WXDLLEXPORT void wxCleanUpPenWin(void);
+WXDLLEXPORT void wxRegisterPenWin();
+WXDLLEXPORT void wxCleanUpPenWin();
 WXDLLEXPORT void wxEnablePenAppHooks (bool hook);
 #endif
 
@@ -106,7 +106,7 @@ VOID    WINAPI ibAdjustWindowRect( HWND hWnd, LPRECT lprc ) ;
  * - NULL any extra child window pointers not created for this item
  *   (e.g. label control that wasn't needed)
  * - delete any extra child windows in the destructor (e.g. label control)
- * - implement GetSize and SetSize
+ * - implement DoSetSize
  * - to find panel position if coordinates are (-1, -1), use GetPosition
  * - call AdvanceCursor after creation, for panel layout mechanism.
  *
@@ -158,7 +158,7 @@ WXDLLEXPORT extern void wxFindMaxSize(WXHWND hwnd, RECT *rect);
 WXDLLEXPORT_DATA(extern wxList) wxScrollBarList;
 // The MakeProcInstance version of the function wxSubclassedGenericControlProc
 WXDLLEXPORT_DATA(extern FARPROC) wxGenericControlSubClassProc;
-WXDLLEXPORT_DATA(extern char*) wxBuffer;
+WXDLLEXPORT_DATA(extern wxChar*) wxBuffer;
 WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance;
 
 WXDLLEXPORT wxWindow* wxFindControlFromHandle(WXHWND hWnd);
@@ -192,7 +192,7 @@ inline bool wxStyleHasBorder(long style)
 #define OutputDebugString OutputDebugStringW95
 #endif
 
-extern void OutputDebugStringW95(const char*, ...);
+extern void OutputDebugStringW95(const wxChar*, ...);
 #endif
 
 #endif