#include "wx/defs.h"
-#if wxUSE_OWNERDRAWNCOMBOBOX
+#if wxUSE_ODCOMBOBOX
#include "wx/combo.h"
#include "wx/ctrlsub.h"
{
// when set, we are painting the selected item in control,
// not in the popup
- wxCC_PAINTING_CONTROL = 0x0001
+ wxCP_PAINTING_CONTROL = 0x0001
};
//
// Notes:
// wxOwnerDrawnComboBox uses this as its popup. However, it always derives
-// from native wxComboControl. If you need to use this popup with
+// from native wxComboCtrl. If you need to use this popup with
// wxGenericComboControl, then remember that vast majority of item manipulation
// functionality is implemented in the wxVListBoxComboPopup class itself.
//
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxVListBoxComboPopup : public wxVListBox, public wxComboPopup
+class WXDLLIMPEXP_ADV wxVListBoxComboPopup : public wxVListBox,
+ public wxComboPopup
{
friend class wxOwnerDrawnComboBox;
public:
- // ctor and dtor
- wxVListBoxComboPopup(wxComboControlBase* combo);
+ // init and dtor
+ wxVListBoxComboPopup() : wxVListBox(), wxComboPopup() { }
virtual ~wxVListBoxComboPopup();
// required virtuals
+ virtual void Init();
virtual bool Create(wxWindow* parent);
virtual wxWindow *GetControl() { return this; }
virtual void SetStringValue( const wxString& value );
virtual void OnComboDoubleClick();
virtual bool LazyCreate();
+ // Callbacks for drawing and measuring items. Override in a derived class for
+ // owner-drawnness.
+ // item: item index to be drawn, may be wxNOT_FOUND when painting combo control itself
+ // and there is no valid selection
+ // flags: wxCP_PAINTING_CONTROL is set if painting to combo control instead of list
+ virtual void OnDrawItem( wxDC& dc, const wxRect& rect, int item, int flags ) const;
+
+ // Return item width, or -1 for calculating from text extent (default)
+ virtual wxCoord OnMeasureItemWidth( size_t item ) const;
+
+
// Item management
void SetSelection( int item );
void Insert( const wxString& item, int pos );
wxString GetString( int item ) const;
unsigned int GetCount() const;
int FindString(const wxString& s) const;
+ int GetSelection() const;
- void Populate( int n, const wxString choices[] );
+ //void Populate( int n, const wxString choices[] );
+ void Populate( const wxArrayString& choices );
void ClearClientDatas();
// helpers
bool HandleKey( int keycode, bool saturate );
// sends combobox select event from the parent combo control
- void SendComboBoxEvent();
+ void SendComboBoxEvent( int selection );
+
+ // gets value, sends event and dismisses
+ void DismissWithEvent();
// Re-calculates width for given item
void CheckWidth( int pos );
// wxVListBox implementation
virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const;
- virtual wxCoord OnMeasureItem(size_t n) const;
+ //virtual wxCoord OnMeasureItem(size_t n) const;
void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const;
+ // Return item height
+ virtual wxCoord OnMeasureItem( size_t item ) const;
+
// filter mouse move events happening outside the list box
// move selection with cursor
void OnMouseMove(wxMouseEvent& event);
wxArrayPtrVoid m_clientDatas;
wxArrayInt m_widths; // cached line widths
- wxFont m_font;
+ wxFont m_useFont;
+ //wxString m_stringValue; // displayed text (may be different than m_strings[m_value])
int m_value; // selection
int m_itemHover; // on which item the cursor is
int m_widestWidth; // width of widest item thus far
// ----------------------------------------------------------------------------
// wxOwnerDrawnComboBox: a generic wxComboBox that allows custom paint items
// in addition to many other types of customization already allowed by
-// the wxComboControl.
+// the wxComboCtrl.
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxOwnerDrawnComboBox : public wxComboControl, public wxItemContainer
+class WXDLLIMPEXP_ADV wxOwnerDrawnComboBox : public wxComboCtrl,
+ public wxItemContainer
{
friend class wxComboPopupWindow;
- friend class wxComboControlBase;
+ friend class wxComboCtrlBase;
public:
// ctors and such
- wxOwnerDrawnComboBox() : wxComboControl() { Init(); }
+ wxOwnerDrawnComboBox() : wxComboCtrl() { Init(); }
wxOwnerDrawnComboBox(wxWindow *parent,
wxWindowID id,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr)
- : wxComboControl()
+ : wxComboCtrl()
{
Init();
const wxPoint& pos,
const wxSize& size,
const wxArrayString& choices,
- long style = 0,
+ long style,
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,
+ const wxString& value,
+ const wxPoint& pos,
+ const wxSize& size,
+ int n,
+ const wxString choices[],
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr);
virtual ~wxOwnerDrawnComboBox();
+ // NULL popup can be used to indicate default interface
+ virtual void SetPopupControl( wxComboPopup* popup );
+
// wxControlWithItems methods
virtual void Clear();
virtual void Delete(unsigned int n);
virtual int FindString(const wxString& s) const;
virtual void Select(int n);
virtual int GetSelection() const;
- void SetSelection(int n) { Select(n); }
+ virtual void SetSelection(int n) { Select(n); }
+
+
+ // Prevent a method from being hidden
+ virtual void SetSelection(long from, long to)
+ {
+ wxComboCtrl::SetSelection(from,to);
+ }
wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
// overload m_popupInterface member so we can access specific popup interface easier
wxVListBoxComboPopup* m_popupInterface;
+ // temporary storage for the initial choices
+ //const wxString* m_baseChoices;
+ //int m_baseChoicesCount;
+ wxArrayString m_initChs;
+
private:
void Init();
};
-#endif // wxUSE_OWNERDRAWNCOMBOBOX
+#endif // wxUSE_ODCOMBOBOX
+
#endif
// _WX_ODCOMBO_H_
projects / wxWidgets.git / blobdiff