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.
93 lines
3.1 KiB
C++
93 lines
3.1 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/qt/combobox.h
|
|
// Author: Peter Most, Mariano Reingart
|
|
// Copyright: (c) 2010 wxWidgets dev team
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_QT_COMBOBOX_H_
|
|
#define _WX_QT_COMBOBOX_H_
|
|
|
|
#include "wx/choice.h"
|
|
class QComboBox;
|
|
|
|
class WXDLLIMPEXP_CORE wxComboBox : public wxChoice, public wxTextEntry
|
|
{
|
|
public:
|
|
wxComboBox();
|
|
|
|
wxComboBox(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxString& value = wxEmptyString,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
int n = 0, const wxString choices[] = NULL,
|
|
long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxComboBoxNameStr);
|
|
|
|
wxComboBox(wxWindow *parent, wxWindowID id,
|
|
const wxString& value,
|
|
const wxPoint& pos,
|
|
const wxSize& size,
|
|
const wxArrayString& choices,
|
|
long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxComboBoxNameStr);
|
|
|
|
bool Create(wxWindow *parent, wxWindowID id,
|
|
const wxString& value = wxEmptyString,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
int n = 0, const wxString choices[] = (const wxString *) NULL,
|
|
long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxComboBoxNameStr);
|
|
bool Create(wxWindow *parent, wxWindowID id,
|
|
const wxString& value,
|
|
const wxPoint& pos,
|
|
const wxSize& size,
|
|
const wxArrayString& choices,
|
|
long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxComboBoxNameStr);
|
|
|
|
virtual void SetSelection(int n) wxOVERRIDE { wxChoice::SetSelection(n); }
|
|
virtual void SetSelection(long from, long to) wxOVERRIDE;
|
|
|
|
virtual int GetSelection() const wxOVERRIDE { return wxChoice::GetSelection(); }
|
|
virtual void GetSelection(long *from, long *to) const wxOVERRIDE;
|
|
|
|
virtual wxString GetStringSelection() const wxOVERRIDE
|
|
{
|
|
return wxItemContainer::GetStringSelection();
|
|
}
|
|
|
|
virtual void Clear() wxOVERRIDE
|
|
{
|
|
wxTextEntry::Clear();
|
|
wxItemContainer::Clear();
|
|
}
|
|
|
|
// See wxComboBoxBase discussion of IsEmpty().
|
|
bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
|
|
bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }
|
|
|
|
virtual void Popup();
|
|
virtual void Dismiss();
|
|
|
|
protected:
|
|
|
|
// From wxTextEntry:
|
|
virtual wxString DoGetValue() const wxOVERRIDE;
|
|
|
|
private:
|
|
|
|
// From wxTextEntry:
|
|
virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; }
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxComboBox);
|
|
};
|
|
|
|
#endif // _WX_QT_COMBOBOX_H_
|