removed odbc from the libraries used by the console sample

[wxWidgets.git] / samples / widgets / listbox.cpp

diff --git a/samples/widgets/listbox.cpp b/samples/widgets/listbox.cpp
index 0a40eb74e1959b96c10574fc56bf928176fd56a8..b92ae08e7db2981760eeef887e18e35887bcc7fb 100644 (file)
--- a/samples/widgets/listbox.cpp
+++ b/samples/widgets/listbox.cpp
@@ -44,6 +44,7 @@
 
 #include "wx/checklst.h"
 
 
 #include "wx/checklst.h"
 

+#include "itemcontainer.h"

 #include "widgets.h"
 
 #include "icons/listbox.xpm"
 #include "widgets.h"
 
 #include "icons/listbox.xpm"


@@ -55,7 +56,7 @@
 // control ids
 enum
 {
 // control ids
 enum
 {

-    ListboxPage_Reset = 100,
+    ListboxPage_Reset = wxID_HIGHEST,

     ListboxPage_Add,
     ListboxPage_AddText,
     ListboxPage_AddSeveral,
     ListboxPage_Add,
     ListboxPage_AddText,
     ListboxPage_AddSeveral,


@@ -66,21 +67,26 @@ enum
     ListboxPage_Delete,
     ListboxPage_DeleteText,
     ListboxPage_DeleteSel,
     ListboxPage_Delete,
     ListboxPage_DeleteText,
     ListboxPage_DeleteSel,

-    ListboxPage_Listbox
+    ListboxPage_Listbox,
+    ListboxPage_ContainerTests

 };
 
 // ----------------------------------------------------------------------------
 // ListboxWidgetsPage
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // ListboxWidgetsPage
 // ----------------------------------------------------------------------------
 

-class ListboxWidgetsPage : public WidgetsPage
+class ListboxWidgetsPage : public ItemContainerWidgetsPage

 {
 public:
     ListboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
 
     virtual wxControl *GetWidget() const { return m_lbox; }
 {
 public:
     ListboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
 
     virtual wxControl *GetWidget() const { return m_lbox; }

+    virtual wxItemContainer* GetContainer() const { return m_lbox; }

     virtual void RecreateWidget() { CreateLbox(); }
 
     virtual void RecreateWidget() { CreateLbox(); }
 

+    // lazy creation of the content
+    virtual void CreateContent();
+

 protected:
     // event handlers
     void OnButtonReset(wxCommandEvent& event);
 protected:
     // event handlers
     void OnButtonReset(wxCommandEvent& event);


@@ -142,7 +148,13 @@ protected:
                *m_chkOwnerDraw;
 
     // the listbox itself and the sizer it is in
                *m_chkOwnerDraw;
 
     // the listbox itself and the sizer it is in

-    wxListBox *m_lbox;
+#ifdef __WXWINCE__
+    wxListBoxBase
+#else
+    wxListBox
+#endif
+                  *m_lbox;
+

     wxSizer *m_sizerLbox;
 
     // the text entries for "Add/change string" and "Delete" buttons
     wxSizer *m_sizerLbox;
 
     // the text entries for "Add/change string" and "Delete" buttons


@@ -168,6 +180,7 @@ BEGIN_EVENT_TABLE(ListboxWidgetsPage, WidgetsPage)
     EVT_BUTTON(ListboxPage_Add, ListboxWidgetsPage::OnButtonAdd)
     EVT_BUTTON(ListboxPage_AddSeveral, ListboxWidgetsPage::OnButtonAddSeveral)
     EVT_BUTTON(ListboxPage_AddMany, ListboxWidgetsPage::OnButtonAddMany)
     EVT_BUTTON(ListboxPage_Add, ListboxWidgetsPage::OnButtonAdd)
     EVT_BUTTON(ListboxPage_AddSeveral, ListboxWidgetsPage::OnButtonAddSeveral)
     EVT_BUTTON(ListboxPage_AddMany, ListboxWidgetsPage::OnButtonAddMany)

+    EVT_BUTTON(ListboxPage_ContainerTests, ItemContainerWidgetsPage::OnButtonTestItemContainer)

 
     EVT_TEXT_ENTER(ListboxPage_AddText, ListboxWidgetsPage::OnButtonAdd)
     EVT_TEXT_ENTER(ListboxPage_DeleteText, ListboxWidgetsPage::OnButtonDelete)
 
     EVT_TEXT_ENTER(ListboxPage_AddText, ListboxWidgetsPage::OnButtonAdd)
     EVT_TEXT_ENTER(ListboxPage_DeleteText, ListboxWidgetsPage::OnButtonDelete)


@@ -193,17 +206,20 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+#if defined(__WXUNIVERSAL__)
+    #define FAMILY_CTRLS UNIVERSAL_CTRLS
+#else
+    #define FAMILY_CTRLS NATIVE_CTRLS
+#endif
+

 IMPLEMENT_WIDGETS_PAGE(ListboxWidgetsPage, _T("Listbox"),
 IMPLEMENT_WIDGETS_PAGE(ListboxWidgetsPage, _T("Listbox"),

-                       (int)wxPlatform(GENERIC_CTRLS).If(wxMSW,NATIVE_CTRLS)
-                       | WITH_ITEMS_CTRLS
+                       FAMILY_CTRLS | WITH_ITEMS_CTRLS

                        );
 
 ListboxWidgetsPage::ListboxWidgetsPage(WidgetsBookCtrl *book,
                                        wxImageList *imaglist)
                        );
 
 ListboxWidgetsPage::ListboxWidgetsPage(WidgetsBookCtrl *book,
                                        wxImageList *imaglist)

-                  : WidgetsPage(book)
+                  : ItemContainerWidgetsPage(book, imaglist, listbox_xpm)

 {
 {

-    imaglist->Add(wxBitmap(listbox_xpm));
-

     // init everything
     m_radioSelMode = (wxRadioBox *)NULL;
 
     // init everything
     m_radioSelMode = (wxRadioBox *)NULL;
 


@@ -213,9 +229,13 @@ ListboxWidgetsPage::ListboxWidgetsPage(WidgetsBookCtrl *book,
     m_chkSort =
     m_chkOwnerDraw = (wxCheckBox *)NULL;
 
     m_chkSort =
     m_chkOwnerDraw = (wxCheckBox *)NULL;
 

-    m_lbox = (wxListBox *)NULL;
+    m_lbox = NULL;

     m_sizerLbox = (wxSizer *)NULL;
 
     m_sizerLbox = (wxSizer *)NULL;
 

+}
+
+void ListboxWidgetsPage::CreateContent()
+{

     /*
        What we create here is a frame having 3 panes: style pane is the
        leftmost one, in the middle the pane with buttons allowing to perform
     /*
        What we create here is a frame having 3 panes: style pane is the
        leftmost one, in the middle the pane with buttons allowing to perform


@@ -299,6 +319,9 @@ ListboxWidgetsPage::ListboxWidgetsPage(WidgetsBookCtrl *book,
     btn = new wxButton(this, ListboxPage_Clear, _T("&Clear"));
     sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
 
     btn = new wxButton(this, ListboxPage_Clear, _T("&Clear"));
     sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
 

+    btn = new wxButton(this, ListboxPage_ContainerTests, _T("Run &tests"));
+    sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
+

     // right pane
     wxSizer *sizerRight = new wxBoxSizer(wxVERTICAL);
     m_lbox = new wxListBox(this, ListboxPage_Listbox,
     // right pane
     wxSizer *sizerRight = new wxBoxSizer(wxVERTICAL);
     m_lbox = new wxListBox(this, ListboxPage_Listbox,


@@ -318,8 +341,6 @@ ListboxWidgetsPage::ListboxWidgetsPage(WidgetsBookCtrl *book,
     Reset();
 
     SetSizer(sizerTop);
     Reset();
 
     SetSizer(sizerTop);

-
-    sizerTop->Fit(this);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------