wxMenuItem code cleanup, removing duplicate and unneccessary code

[wxWidgets.git] / include / wx / stockitem.h

diff --git a/include/wx/stockitem.h b/include/wx/stockitem.h
index cad8d3a8027a42d25998d75cc41d1deab41d7b66..19cdc593214764f82bbed8469ee425ab301d4942 100644 (file)
--- a/include/wx/stockitem.h
+++ b/include/wx/stockitem.h
@@ -13,7 +13,7 @@
 #define _WX_STOCKITEM_H_
 
 #include "wx/defs.h"
-#include "wx/wxchar.h"
+#include "wx/chartype.h"
 #include "wx/string.h"
 #include "wx/accel.h"
 
@@ -22,11 +22,11 @@
 // ----------------------------------------------------------------------------
 
 // Returns true if the ID is in the list of recognized stock actions
-WXDLLEXPORT bool wxIsStockID(wxWindowID id);
+WXDLLIMPEXP_CORE bool wxIsStockID(wxWindowID id);
 
 // Returns true of the label is empty or label of a stock button with
 // given ID
-WXDLLEXPORT bool wxIsStockLabel(wxWindowID id, const wxString& label);
+WXDLLIMPEXP_CORE bool wxIsStockLabel(wxWindowID id, const wxString& label);
 
 enum wxStockLabelQueryFlag
 {
@@ -40,14 +40,14 @@ enum wxStockLabelQueryFlag
 // for wxSTOCK_OK); if wxSTOCK_WITH_MNEMONIC is given, the & character
 // is included; if wxSTOCK_WITH_ACCELERATOR is given, the stock accelerator
 // for given ID is concatenated to the label using \t as separator
-WXDLLEXPORT wxString wxGetStockLabel(wxWindowID id,
+WXDLLIMPEXP_CORE wxString wxGetStockLabel(wxWindowID id,
                                      long flags = wxSTOCK_WITH_MNEMONIC);
 
 #if wxUSE_ACCEL
 
     // Returns the accelerator that should be used for given stock UI element
     // (e.g. "Ctrl+x" for wxSTOCK_EXIT)
-    WXDLLEXPORT wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id);
+    WXDLLIMPEXP_CORE wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id);
 
 #endif
 
@@ -59,14 +59,14 @@ enum wxStockHelpStringClient
 };
 
 // Returns an help string for the given stock UI element and for the given "context".
-WXDLLEXPORT wxString wxGetStockHelpString(wxWindowID id,
+WXDLLIMPEXP_CORE wxString wxGetStockHelpString(wxWindowID id,
                                           wxStockHelpStringClient client = wxSTOCK_MENU);
 
 
 #ifdef __WXGTK20__
 
 // Translates stock ID to GTK+'s stock item string indentifier:
-WXDLLEXPORT const char *wxGetStockGtkID(wxWindowID id);
+WXDLLIMPEXP_CORE const char *wxGetStockGtkID(wxWindowID id);
 
 #endif