don't pass NULL pointer to printf(), this crashes Solaris printf

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

diff --git a/include/wx/stockitem.h b/include/wx/stockitem.h
index 0b157887dc60af912dcc560413ac5a975e7036e6..aa95845f4fc2ccbef5a790c4970b09d24e8a2e6d 100644 (file)
--- a/include/wx/stockitem.h
+++ b/include/wx/stockitem.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/stockitem.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/stockitem.h

-// Purpose:     wxStockItemID enum
+// Purpose:     stock items helpers (privateh header)

 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2004-08-15
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2004-08-15


@@ -17,80 +17,29 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+#include "wx/wxchar.h"

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

-// Stock item IDs for use with wxButton, wxMenu and wxToolBar:
+// Helper functions for stock items handling:

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-enum wxStockItemID
-{
-    wxSTOCK_NONE = 0,
-    wxSTOCK_ADD,
-    wxSTOCK_APPLY,
-    wxSTOCK_BOLD,
-    wxSTOCK_CANCEL,
-    wxSTOCK_CLEAR,
-    wxSTOCK_CLOSE,
-    wxSTOCK_COPY,
-    wxSTOCK_CUT,
-    wxSTOCK_DELETE,
-    wxSTOCK_FIND,
-    wxSTOCK_FIND_AND_REPLACE,
-    wxSTOCK_GO_BACK,
-    wxSTOCK_GO_DOWN,
-    wxSTOCK_GO_FORWARD,
-    wxSTOCK_GO_UP,
-    wxSTOCK_HELP,
-    wxSTOCK_HOME,
-    wxSTOCK_INDENT,
-    wxSTOCK_INDEX,
-    wxSTOCK_ITALIC,
-    wxSTOCK_JUSTIFY_CENTER,
-    wxSTOCK_JUSTIFY_FILL,
-    wxSTOCK_JUSTIFY_LEFT,
-    wxSTOCK_JUSTIFY_RIGHT,
-    wxSTOCK_NEW,
-    wxSTOCK_NO,
-    wxSTOCK_OK,
-    wxSTOCK_OPEN,
-    wxSTOCK_PASTE,
-    wxSTOCK_PREFERENCES,
-    wxSTOCK_PRINT,
-    wxSTOCK_PRINT_PREVIEW,
-    wxSTOCK_PROPERTIES,
-    wxSTOCK_QUIT,
-    wxSTOCK_REDO,
-    wxSTOCK_REFRESH,
-    wxSTOCK_REMOVE,
-    wxSTOCK_REVERT_TO_SAVED,
-    wxSTOCK_SAVE,
-    wxSTOCK_SAVE_AS,
-    wxSTOCK_STOP,
-    wxSTOCK_UNDELETE,
-    wxSTOCK_UNDERLINE,
-    wxSTOCK_UNDO,
-    wxSTOCK_UNINDENT,
-    wxSTOCK_YES,
-    wxSTOCK_ZOOM_100,
-    wxSTOCK_ZOOM_FIT,
-    wxSTOCK_ZOOM_IN,
-    wxSTOCK_ZOOM_OUT
-    // NB: when you add new item here, add it to stockitem.cpp and
-    //     documentation as well
-};
+// Returns true if the ID is in the list of recognized stock actions
+WXDLLEXPORT bool wxIsStockID(wxWindowID id);

 
 

-// ----------------------------------------------------------------------------
-// Helper functions:
-// ----------------------------------------------------------------------------
+// Returns true of the label is empty or label of a stock button with
+// given ID
+WXDLLEXPORT bool wxIsStockLabel(wxWindowID id, const wxString& label);

 
 // Returns label that should be used for given stock UI element (e.g. "&OK"
 // for wxSTOCK_OK):
 
 // Returns label that should be used for given stock UI element (e.g. "&OK"
 // for wxSTOCK_OK):

-wxString wxGetStockItemLabel(wxStockItemID item);
+WXDLLEXPORT wxString wxGetStockLabel(wxWindowID id,
+                                     bool withCodes = true,
+                                     wxString accelerator = wxEmptyString);

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

-const char *wxStockItemToGTK(wxStockItemID item);
+WXDLLEXPORT const char *wxGetStockGtkID(wxWindowID id);

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