Improve sizer support in generic wxNotebook. Fix the widgets sample

[wxWidgets.git] / src / common / stockitem.cpp

diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp
index b6336d564541e9632c11c2cffae8373f5bfd8df8..2838320cb864d9f25b0985b2de6e6bd130188263 100644 (file)
--- a/src/common/stockitem.cpp
+++ b/src/common/stockitem.cpp
@@ -30,7 +30,7 @@
 
 #include "wx/stockitem.h"
 #include "wx/intl.h"
 
 #include "wx/stockitem.h"
 #include "wx/intl.h"

-
+#include "wx/utils.h" // for wxStripMenuCodes()

 
 bool wxIsStockID(wxWindowID id)
 {
 
 bool wxIsStockID(wxWindowID id)
 {


@@ -90,14 +90,17 @@ bool wxIsStockID(wxWindowID id)
 
         default:
             return false;
 
         default:
             return false;

-    };
+    }

 }
 
 }
 

-wxString wxGetStockLabel(wxWindowID id)
+wxString wxGetStockLabel(wxWindowID id, bool withCodes, wxString accelerator)

 {
 {

+    wxString stockLabel;
+

     #define STOCKITEM(stockid, label) \
         case stockid:                 \
     #define STOCKITEM(stockid, label) \
         case stockid:                 \

-            return label;
+            stockLabel = label;       \
+            break;

 
     switch (id)
     {
 
     switch (id)
     {


@@ -158,8 +161,18 @@ wxString wxGetStockLabel(wxWindowID id)
     };
 
     #undef STOCKITEM
     };
 
     #undef STOCKITEM

-    
-    return wxEmptyString;
+
+    if(!withCodes)
+    {
+        stockLabel = wxStripMenuCodes( stockLabel );
+    }
+    else if (!stockLabel.empty() && !accelerator.empty())
+    {
+        stockLabel += _T("\t");
+        stockLabel += accelerator;
+    }
+
+    return stockLabel;

 }
 
 bool wxIsStockLabel(wxWindowID id, const wxString& label)
 }
 
 bool wxIsStockLabel(wxWindowID id, const wxString& label)


@@ -171,11 +184,11 @@ bool wxIsStockLabel(wxWindowID id, const wxString& label)
 
     if (label == stock)
         return true;
 
     if (label == stock)
         return true;

-    
+

     stock.Replace(_T("&"), wxEmptyString);
     if (label == stock)
         return true;
     stock.Replace(_T("&"), wxEmptyString);
     if (label == stock)
         return true;

-    
+

     return false;
 }
 
     return false;
 }
 


@@ -189,7 +202,7 @@ const char *wxGetStockGtkID(wxWindowID id)
     #define STOCKITEM(wx,gtk)      \
         case wx:                   \
             return gtk;
     #define STOCKITEM(wx,gtk)      \
         case wx:                   \
             return gtk;

-    
+

     #define STOCKITEM_MISSING(wx)  \
         case wx:                 \
             return NULL;
     #define STOCKITEM_MISSING(wx)  \
         case wx:                 \
             return NULL;


@@ -259,7 +272,7 @@ const char *wxGetStockGtkID(wxWindowID id)
     };
 
     #undef STOCKITEM
     };
 
     #undef STOCKITEM

-    
+

     return NULL;
 }
 
     return NULL;
 }