WXDLLEXPORT_DATA(const wxChar *) wxGaugeNameStr = wxT("gauge");
WXDLLEXPORT_DATA(const wxChar *) wxStaticBoxNameStr = wxT("groupBox");
WXDLLEXPORT_DATA(const wxChar *) wxListBoxNameStr = wxT("listBox");
-WXDLLEXPORT_DATA(const wxChar *) wxStaticTextNameStr = wxT("message");
-WXDLLEXPORT_DATA(const wxChar *) wxStaticBitmapNameStr = wxT("message");
+WXDLLEXPORT_DATA(const wxChar *) wxListCtrlNameStr = wxT("listCtrl");
+WXDLLEXPORT_DATA(const wxChar *) wxStaticTextNameStr = wxT("staticText");
+WXDLLEXPORT_DATA(const wxChar *) wxStaticBitmapNameStr = wxT("staticBitmap");
WXDLLEXPORT_DATA(const wxChar *) wxMultiTextNameStr = wxT("multitext");
WXDLLEXPORT_DATA(const wxChar *) wxNotebookNameStr = wxT("notebook");
WXDLLEXPORT_DATA(const wxChar *) wxPanelNameStr = wxT("panel");
// Other default strings
WXDLLEXPORT_DATA(const wxChar *) wxFileSelectorDefaultWildcardStr =
-#if defined(__WXMSW__) || defined(__WXOS2__)
+#if defined(__WXMSW__) || defined(__OS2__)
wxT("*.*")
#else // Unix/Mac
wxT("*")
WXDLLEXPORT_DATA(const wxChar *) wxDirDialogNameStr = wxT("wxDirCtrl");
WXDLLEXPORT_DATA(const wxChar *) wxDirDialogDefaultFolderStr = wxT("/");
-#if defined(__WXMSW__) || defined(__WXOS2__)
+#if defined(__WXMSW__) || defined(__OS2__)
WXDLLEXPORT_DATA(const wxChar *) wxUserResourceStr = wxT("TEXT");
#endif