added virtual dtor to wxMacListControl to silence gcc warnings

[wxWidgets.git] / include / wx / odcombo.h

diff --git a/include/wx/odcombo.h b/include/wx/odcombo.h
index 33d7025e55b52b4a5a2211e26df6709854603a7f..832778c23789606bf62daf91d3c72807bdd1ea48 100644 (file)
--- a/include/wx/odcombo.h
+++ b/include/wx/odcombo.h
@@ -14,7 +14,7 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_OWNERDRAWNCOMBOBOX
+#if wxUSE_ODCOMBOBOX

 
 #include "wx/combo.h"
 #include "wx/ctrlsub.h"
 
 #include "wx/combo.h"
 #include "wx/ctrlsub.h"


@@ -43,7 +43,7 @@ enum
 {
     // when set, we are painting the selected item in control,
     // not in the popup
 {
     // when set, we are painting the selected item in control,
     // not in the popup

-    wxCC_PAINTING_CONTROL       = 0x0001
+    wxCP_PAINTING_CONTROL           = 0x0001

 };
 
 
 };
 
 


@@ -52,23 +52,25 @@ enum
 //
 // Notes:
 //   wxOwnerDrawnComboBox uses this as its popup. However, it always derives
 //
 // 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.
 //
 // ----------------------------------------------------------------------------
 
 
 //   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:
 
 {
     friend class wxOwnerDrawnComboBox;
 public:
 

-    // ctor and dtor
-    wxVListBoxComboPopup(wxComboControlBase* combo);
+    // init and dtor
+    wxVListBoxComboPopup() : wxVListBox(), wxComboPopup() { }

     virtual ~wxVListBoxComboPopup();
 
     // required virtuals
     virtual ~wxVListBoxComboPopup();
 
     // required virtuals

+    virtual void Init();

     virtual bool Create(wxWindow* parent);
     virtual wxWindow *GetControl() { return this; }
     virtual void SetStringValue( const wxString& value );
     virtual bool Create(wxWindow* parent);
     virtual wxWindow *GetControl() { return this; }
     virtual void SetStringValue( const wxString& value );


@@ -82,6 +84,17 @@ public:
     virtual void OnComboDoubleClick();
     virtual bool LazyCreate();
 
     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 );
     // Item management
     void SetSelection( int item );
     void Insert( const wxString& item, int pos );


@@ -94,8 +107,10 @@ public:
     wxString GetString( int item ) const;
     unsigned int GetCount() const;
     int FindString(const wxString& s) const;
     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
     void ClearClientDatas();
 
     // helpers


@@ -109,16 +124,22 @@ protected:
     bool HandleKey( int keycode, bool saturate );
 
     // sends combobox select event from the parent combo control
     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;
 
     // 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;
 
     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);
     // filter mouse move events happening outside the list box
     // move selection with cursor
     void OnMouseMove(wxMouseEvent& event);


@@ -130,8 +151,9 @@ protected:
     wxArrayPtrVoid          m_clientDatas;
     wxArrayInt              m_widths; // cached line widths
 
     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
     int                     m_value; // selection
     int                     m_itemHover; // on which item the cursor is
     int                     m_widestWidth; // width of widest item thus far


@@ -153,17 +175,18 @@ private:
 // ----------------------------------------------------------------------------
 // wxOwnerDrawnComboBox: a generic wxComboBox that allows custom paint items
 // in addition to many other types of customization already allowed by
 // ----------------------------------------------------------------------------
 // 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 wxComboPopupWindow;

-    friend class wxComboControlBase;
+    friend class wxComboCtrlBase;

 public:
 
     // ctors and such
 public:
 
     // ctors and such

-    wxOwnerDrawnComboBox() : wxComboControl() { Init(); }
+    wxOwnerDrawnComboBox() : wxComboCtrl() { Init(); }

 
     wxOwnerDrawnComboBox(wxWindow *parent,
                          wxWindowID id,
 
     wxOwnerDrawnComboBox(wxWindow *parent,
                          wxWindowID id,


@@ -175,7 +198,7 @@ public:
                          long style = 0,
                          const wxValidator& validator = wxDefaultValidator,
                          const wxString& name = wxComboBoxNameStr)
                          long style = 0,
                          const wxValidator& validator = wxDefaultValidator,
                          const wxString& name = wxComboBoxNameStr)

-        : wxComboControl()
+        : wxComboCtrl()

     {
         Init();
 
     {
         Init();
 


@@ -185,7 +208,7 @@ public:
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
 
     bool Create(wxWindow *parent,
                 wxWindowID id,

-                const wxString& value = wxEmptyString,
+                const wxString& value,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,


@@ -225,6 +248,9 @@ public:
 
     virtual ~wxOwnerDrawnComboBox();
 
 
     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);
     // wxControlWithItems methods
     virtual void Clear();
     virtual void Delete(unsigned int n);


@@ -234,7 +260,7 @@ public:
     virtual int FindString(const wxString& s) const;
     virtual void Select(int n);
     virtual int GetSelection() const;
     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); }

 
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 
 
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 


@@ -253,6 +279,11 @@ protected:
     // overload m_popupInterface member so we can access specific popup interface easier
     wxVListBoxComboPopup*   m_popupInterface;
 
     // 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();
 
 private:
     void Init();
 


@@ -262,6 +293,6 @@ private:
 };
 
 
 };
 
 

-#endif // wxUSE_OWNERDRAWNCOMBOBOX
+#endif // wxUSE_ODCOMBOBOX

 #endif
     // _WX_ODCOMBO_H_
 #endif
     // _WX_ODCOMBO_H_