X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8435fa381a3479dc5fe8c3d56d8e58b53568599..2df7be7f2cca699a02ee0c9ce69de9bfe6b0922f:/include/wx/msw/combobox.h?ds=sidebyside

diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index fdebc76c48..a44538e7ff 100644
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __COMBOBOXH__
-#define __COMBOBOXH__
+#ifndef _WX_COMBOBOX_H_
+#define _WX_COMBOBOX_H_
 
 #ifdef __GNUG__
 #pragma interface "combobox.h"
@@ -18,10 +18,10 @@
 
 #include "wx/choice.h"
 
-#if USE_COMBOBOX
+#if wxUSE_COMBOBOX
 
-WXDLLEXPORT_DATA(extern const char*) wxComboBoxNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 // Combobox item
 class WXDLLEXPORT wxComboBox: public wxChoice
@@ -78,6 +78,6 @@ class WXDLLEXPORT wxComboBox: public wxChoice
   virtual bool MSWCommand(WXUINT param, WXWORD id);
 };
 
-#endif // USE_COMBOBOX
+#endif // wxUSE_COMBOBOX
 #endif
-    // __COMBOBOXH__
+    // _WX_COMBOBOX_H_