projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rebake from clean wx tree.
[wxWidgets.git]
/
include
/
wx
/
motif
/
toolbar.h
diff --git
a/include/wx/motif/toolbar.h
b/include/wx/motif/toolbar.h
index ca6a14377f7e7ee7e73b99ff4de81de149729582..6407334fce888eb8af71c012fa9c6bb763486876 100644
(file)
--- a/
include/wx/motif/toolbar.h
+++ b/
include/wx/motif/toolbar.h
@@
-12,7
+12,7
@@
#ifndef _WX_TOOLBAR_H_
#define _WX_TOOLBAR_H_
#ifndef _WX_TOOLBAR_H_
#define _WX_TOOLBAR_H_
-class WXDLL
EXPORT
wxToolBar : public wxToolBarBase
+class WXDLL
IMPEXP_CORE
wxToolBar : public wxToolBarBase
{
public:
// ctors and dtor
{
public:
// ctors and dtor
@@
-69,7
+69,8
@@
private:
wxObject *clientData,
const wxString& shortHelp,
const wxString& longHelp);
wxObject *clientData,
const wxString& shortHelp,
const wxString& longHelp);
- virtual wxToolBarToolBase *CreateTool(wxControl *control);
+ virtual wxToolBarToolBase *CreateTool(wxControl *control,
+ const wxString& label);
virtual void DoSetSize(int x, int y,
int width, int height,
virtual void DoSetSize(int x, int y,
int width, int height,