Add missing wxUSE_OLE checks to safearray.cpp.

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

diff --git a/include/wx/stockitem.h b/include/wx/stockitem.h
index 126489afa46139975c804c10a1295ad29d479741..b13f84dc127079703eeb263fa58deee6bb64bb26 100644 (file)
--- a/include/wx/stockitem.h
+++ b/include/wx/stockitem.h
@@ -13,7 +13,7 @@
 #define _WX_STOCKITEM_H_
 
 #include "wx/defs.h"
 #define _WX_STOCKITEM_H_
 
 #include "wx/defs.h"

-#include "wx/wxchar.h"
+#include "wx/chartype.h"

 #include "wx/string.h"
 #include "wx/accel.h"
 
 #include "wx/string.h"
 #include "wx/accel.h"
 


@@ -22,32 +22,40 @@
 // ----------------------------------------------------------------------------
 
 // Returns true if the ID is in the list of recognized stock actions
 // ----------------------------------------------------------------------------
 
 // 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
 
 // 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
 {
     wxSTOCK_NOFLAGS = 0,
 
     wxSTOCK_WITH_MNEMONIC = 1,
 
 enum wxStockLabelQueryFlag
 {
     wxSTOCK_NOFLAGS = 0,
 
     wxSTOCK_WITH_MNEMONIC = 1,

-    wxSTOCK_WITH_ACCELERATOR = 2
+    wxSTOCK_WITH_ACCELERATOR = 2,
+
+    // by default, stock items text is returned with ellipsis, if appropriate,
+    // this flag allows to avoid having it
+    wxSTOCK_WITHOUT_ELLIPSIS = 4,
+
+    // return label for button, not menu item: buttons should always use
+    // mnemonics and never use ellipsis
+    wxSTOCK_FOR_BUTTON = wxSTOCK_WITHOUT_ELLIPSIS | wxSTOCK_WITH_MNEMONIC

 };
 
 // Returns label that should be used for given stock UI element (e.g. "&OK"
 // 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
 };
 
 // Returns label that should be used for given stock UI element (e.g. "&OK"
 // 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)
                                      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
 
 
 #endif
 


@@ -59,19 +67,15 @@ enum wxStockHelpStringClient
 };
 
 // Returns an help string for the given stock UI element and for the given "context".
 };
 
 // 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__
 
                                           wxStockHelpStringClient client = wxSTOCK_MENU);
 
 
 #ifdef __WXGTK20__
 

-#include <gdk/gdktypes.h>
-

 // Translates stock ID to GTK+'s stock item string indentifier:
 // Translates stock ID to GTK+'s stock item string indentifier:

-WXDLLEXPORT const char *wxGetStockGtkID(wxWindowID id);
+WXDLLIMPEXP_CORE const char *wxGetStockGtkID(wxWindowID id);

 
 

-// Returns stock accelerator modifier and key code for the given ID
-WXDLLEXPORT bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key);

 #endif
 
 #endif // _WX_STOCKITEM_H_
 #endif
 
 #endif // _WX_STOCKITEM_H_