Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove STOCKITEM_26 macro, unneeded after r72001

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-07-10 17:26:40 +00:00
parent c49ba2113c
commit 7dae41b9f7
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/menu.cpp
View File

@@ -1231,8 +1231,6 @@ const char *wxGetStockGtkID(wxWindowID id)
case wx: \ case wx: \
return gtk; return gtk;
#define STOCKITEM_26(wx,gtk) STOCKITEM(wx,gtk)
#if GTK_CHECK_VERSION(2,8,0) #if GTK_CHECK_VERSION(2,8,0)
#define STOCKITEM_28(wx,gtk) STOCKITEM(wx,gtk) #define STOCKITEM_28(wx,gtk) STOCKITEM(wx,gtk)
#else #else
@@ -1248,7 +1246,7 @@ const char *wxGetStockGtkID(wxWindowID id)
switch (id) switch (id)
{ {
STOCKITEM_26(wxID_ABOUT, GTK_STOCK_ABOUT) STOCKITEM(wxID_ABOUT, GTK_STOCK_ABOUT)
STOCKITEM(wxID_ADD, GTK_STOCK_ADD) STOCKITEM(wxID_ADD, GTK_STOCK_ADD)
STOCKITEM(wxID_APPLY, GTK_STOCK_APPLY) STOCKITEM(wxID_APPLY, GTK_STOCK_APPLY)
STOCKITEM(wxID_BACKWARD, GTK_STOCK_GO_BACK) STOCKITEM(wxID_BACKWARD, GTK_STOCK_GO_BACK)
@@ -1263,10 +1261,10 @@ const char *wxGetStockGtkID(wxWindowID id)
STOCKITEM(wxID_CUT, GTK_STOCK_CUT) STOCKITEM(wxID_CUT, GTK_STOCK_CUT)
STOCKITEM(wxID_DELETE, GTK_STOCK_DELETE) STOCKITEM(wxID_DELETE, GTK_STOCK_DELETE)
STOCKITEM(wxID_DOWN, GTK_STOCK_GO_DOWN) STOCKITEM(wxID_DOWN, GTK_STOCK_GO_DOWN)
STOCKITEM_26(wxID_EDIT, GTK_STOCK_EDIT) STOCKITEM(wxID_EDIT, GTK_STOCK_EDIT)
STOCKITEM(wxID_EXECUTE, GTK_STOCK_EXECUTE) STOCKITEM(wxID_EXECUTE, GTK_STOCK_EXECUTE)
STOCKITEM(wxID_EXIT, GTK_STOCK_QUIT) STOCKITEM(wxID_EXIT, GTK_STOCK_QUIT)
STOCKITEM_26(wxID_FILE, GTK_STOCK_FILE) STOCKITEM(wxID_FILE, GTK_STOCK_FILE)
STOCKITEM(wxID_FIND, GTK_STOCK_FIND) STOCKITEM(wxID_FIND, GTK_STOCK_FIND)
STOCKITEM(wxID_FIRST, GTK_STOCK_GOTO_FIRST) STOCKITEM(wxID_FIRST, GTK_STOCK_GOTO_FIRST)
STOCKITEM(wxID_FLOPPY, GTK_STOCK_FLOPPY) STOCKITEM(wxID_FLOPPY, GTK_STOCK_FLOPPY)