HKEY -> WXHKEY, wxScrolledWindow::SetScale added

[wxWidgets.git] / src / gtk / combobox.cpp

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index bf9aa9dcc731ac2ade1f370ce883051fafc85668..4bcce99f9f3e8d1a197df5a0179897dc4052467e 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -191,7 +191,7 @@ char* wxComboBox::GetClientData( int n )
   
   wxFAIL_MSG( "wxComboBox: wrong index" );
   
-  return NULL;
+  return (char *) NULL;
 }
 
 void wxComboBox::SetClientData( int n, char * clientData )