merged 2.2 branch

[wxWidgets.git] / user / wxConvert / wxConvert.cpp

diff --git a/user/wxConvert/wxConvert.cpp b/user/wxConvert/wxConvert.cpp
index fb363927f426c4f542b8c4fa70724c8d1307b375..49e8a4f9d941fd51eb121fc902a6368c4fa49557 100644 (file)
--- a/user/wxConvert/wxConvert.cpp
+++ b/user/wxConvert/wxConvert.cpp
@@ -56,7 +56,7 @@ BEGIN_EVENT_TABLE(MyFrame,wxFrame)
 END_EVENT_TABLE()
 
 MyFrame::MyFrame(void) :
-  wxFrame( NULL, -1, "wxConvert", wxPoint(20,20), wxSize(400,160) )
+  wxFrame( (wxFrame *) NULL, -1, (char *) "wxConvert", wxPoint(20,20), wxSize(400,160) )
 {
   CreateStatusBar( 1 );