3da6b9c14f
This fixes a missing include in qt/nonownedwnd.cpp and a missing method in qt/glcanvas.cpp, allowing the build to complete again. A number of missing wxOVERRIDE statements were added to reduce the important number of compiler warnings about those missing labels.
80 lines
2.7 KiB
C++
80 lines
2.7 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/qt/toolbar.h
|
|
// Author: Sean D'Epagnier, Mariano Reingart
|
|
// Copyright: (c) 2010 wxWidgets dev team
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
class QToolBar;
|
|
|
|
#ifndef _WX_QT_TOOLBAR_H_
|
|
#define _WX_QT_TOOLBAR_H_
|
|
|
|
class QActionGroup;
|
|
class wxQtToolBar;
|
|
|
|
class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase
|
|
{
|
|
public:
|
|
|
|
wxToolBar() { Init(); }
|
|
wxToolBar(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxTB_DEFAULT_STYLE | wxNO_BORDER,
|
|
const wxString& name = wxToolBarNameStr)
|
|
{
|
|
Init();
|
|
|
|
Create(parent, id, pos, size, style, name);
|
|
}
|
|
|
|
virtual ~wxToolBar();
|
|
|
|
void Init();
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxTB_DEFAULT_STYLE | wxNO_BORDER,
|
|
const wxString& name = wxToolBarNameStr);
|
|
|
|
virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE;
|
|
virtual QToolBar *GetQToolBar() const { return m_qtToolBar; }
|
|
|
|
virtual void SetWindowStyleFlag( long style ) wxOVERRIDE;
|
|
virtual bool Realize() wxOVERRIDE;
|
|
|
|
virtual wxToolBarToolBase *CreateTool(int toolid,
|
|
const wxString& label,
|
|
const wxBitmap& bmpNormal,
|
|
const wxBitmap& bmpDisabled,
|
|
wxItemKind kind,
|
|
wxObject *clientData,
|
|
const wxString& shortHelp,
|
|
const wxString& longHelp) wxOVERRIDE;
|
|
|
|
virtual wxToolBarToolBase *CreateTool(wxControl *control,
|
|
const wxString& label) wxOVERRIDE;
|
|
QWidget *GetHandle() const wxOVERRIDE;
|
|
|
|
protected:
|
|
|
|
QActionGroup* GetActionGroup(size_t pos);
|
|
virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE;
|
|
virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE;
|
|
virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable) wxOVERRIDE;
|
|
virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE;
|
|
virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE;
|
|
|
|
private:
|
|
long GetButtonStyle();
|
|
|
|
QToolBar *m_qtToolBar;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxToolBar);
|
|
};
|
|
|
|
#endif // _WX_QT_TOOLBAR_H_
|