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

Allow headers to be compiled in Objective-C++ mode

Browse Source 
Changed id to one of:
winid   Window IDs and event system
itemid  Menu items
toolid  Toolbar items


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-03-21 02:58:55 +00:00
parent 6f87d5542d
commit d9e2e4c242
12 changed files with 249 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/tbarsmpl.h
View File

@@ -33,7 +33,7 @@ public:
wxToolBarSimple() { Init(); }
wxToolBarSimple(wxWindow *parent,
wxWindowID id,
wxWindowID winid,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxNO_BORDER | wxTB_HORIZONTAL,
@@ -41,11 +41,11 @@ public:
{
Init();
Create(parent, id, pos, size, style, name);
Create(parent, winid, pos, size, style, name);
}
bool Create(wxWindow *parent,
wxWindowID id,
wxWindowID winid,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxNO_BORDER | wxTB_HORIZONTAL,
@@ -108,7 +108,7 @@ protected:
// implement base class pure virtuals
virtual wxToolBarToolBase *DoAddTool
(
int id,
int toolid,
const wxString& label,
const wxBitmap& bitmap,
const wxBitmap& bmpDisabled,
@@ -127,7 +127,7 @@ protected:
virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
virtual wxToolBarToolBase *CreateTool(int id,
virtual wxToolBarToolBase *CreateTool(int winid,
const wxString& label,
const wxBitmap& bmpNormal,
const wxBitmap& bmpDisabled,