X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47d67540a017101b3e46abe9ef0f55914d8de37e..74295623bb14ed23da081f002aa99380d5c1a2e2:/include/wx/tbarsmpl.h diff --git a/include/wx/tbarsmpl.h b/include/wx/tbarsmpl.h index 2e4911aee1..54e1354a77 100644 --- a/include/wx/tbarsmpl.h +++ b/include/wx/tbarsmpl.h @@ -26,7 +26,7 @@ class WXDLLEXPORT wxMemoryDC; -WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; WXDLLEXPORT_DATA(extern const wxSize) wxDefaultSize; WXDLLEXPORT_DATA(extern const wxPoint) wxDefaultPosition; @@ -62,10 +62,10 @@ class WXDLLEXPORT wxToolBarSimple : public wxToolBarBase virtual void SpringUpButton(int index); - void Layout(void); + virtual void LayoutTools(); // The post-tool-addition call - bool Realize() { Layout(); return TRUE; }; + virtual bool Realize() { LayoutTools(); return TRUE; }; protected: int m_currentRowsOrColumns;