fix the tests to pass with both gcc and msvc (2nd part of patch 1462778)

[wxWidgets.git] / samples / listctrl / listtest.h

diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h
index 6578e4df761836a4e705bf1377afe24ff57ec9c5..600eaf4b1ae08c3861574d624f6087333263e817 100644 (file)
--- a/samples/listctrl/listtest.h
+++ b/samples/listctrl/listtest.h
@@ -5,15 +5,28 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+// not all ports have support for EVT_CONTEXT_MENU yet, don't define
+// USE_CONTEXT_MENU for those which don't
+#if defined(__WXMOTIF__) || defined(__WXPM__) || defined(__WXX11__) || defined(__WXMGL__)
+    #define USE_CONTEXT_MENU 0
+#else
+    #define USE_CONTEXT_MENU 1
+#endif
+

 // Define a new application type
 class MyApp: public wxApp
 {
 public:
 // Define a new application type
 class MyApp: public wxApp
 {
 public:

+    MyApp() { }
+

     virtual bool OnInit();
     virtual bool OnInit();

+
+private:
+    DECLARE_NO_COPY_CLASS(MyApp)

 };
 
 class MyListCtrl: public wxListCtrl
 };
 
 class MyListCtrl: public wxListCtrl


@@ -25,8 +38,11 @@ public:
                const wxSize& size,
                long style)
         : wxListCtrl(parent, id, pos, size, style),
                const wxSize& size,
                long style)
         : wxListCtrl(parent, id, pos, size, style),

-          m_attr(*wxCYAN, *wxLIGHT_GREY, wxNullFont)
+          m_attr(*wxBLUE, *wxLIGHT_GREY, wxNullFont)

         {
         {

+#ifdef __POCKETPC__
+            EnableContextMenu();
+#endif

         }
 
     // add one item to the listctrl in report mode
         }
 
     // add one item to the listctrl in report mode


@@ -43,8 +59,10 @@ public:
     void OnEndLabelEdit(wxListEvent& event);
     void OnDeleteItem(wxListEvent& event);
     void OnDeleteAllItems(wxListEvent& event);
     void OnEndLabelEdit(wxListEvent& event);
     void OnDeleteItem(wxListEvent& event);
     void OnDeleteAllItems(wxListEvent& event);

+#if WXWIN_COMPATIBILITY_2_4

     void OnGetInfo(wxListEvent& event);
     void OnSetInfo(wxListEvent& event);
     void OnGetInfo(wxListEvent& event);
     void OnSetInfo(wxListEvent& event);

+#endif

     void OnSelected(wxListEvent& event);
     void OnDeselected(wxListEvent& event);
     void OnListKeyDown(wxListEvent& event);
     void OnSelected(wxListEvent& event);
     void OnDeselected(wxListEvent& event);
     void OnListKeyDown(wxListEvent& event);


@@ -54,17 +72,27 @@ public:
 
     void OnChar(wxKeyEvent& event);
 
 
     void OnChar(wxKeyEvent& event);
 

+#if USE_CONTEXT_MENU
+    void OnContextMenu(wxContextMenuEvent& event);
+#endif
+
+    void OnRightClick(wxMouseEvent& event);
+

 private:
 private:

+    void ShowContextMenu(const wxPoint& pos);
+    wxLog *m_logOld;

     void SetColumnImage(int col, int image);
 
     void LogEvent(const wxListEvent& event, const wxChar *eventName);
     void SetColumnImage(int col, int image);
 
     void LogEvent(const wxListEvent& event, const wxChar *eventName);

+    void LogColEvent(const wxListEvent& event, const wxChar *eventName);

 
     virtual wxString OnGetItemText(long item, long column) const;
 
     virtual wxString OnGetItemText(long item, long column) const;

-    virtual int OnGetItemImage(long item) const;
+    virtual int OnGetItemColumnImage(long item, long column) const;

     virtual wxListItemAttr *OnGetItemAttr(long item) const;
 
     wxListItemAttr m_attr;
 
     virtual wxListItemAttr *OnGetItemAttr(long item) const;
 
     wxListItemAttr m_attr;
 

+    DECLARE_NO_COPY_CLASS(MyListCtrl)

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -72,13 +100,12 @@ private:
 class MyFrame: public wxFrame
 {
 public:
 class MyFrame: public wxFrame
 {
 public:

-    MyListCtrl *m_listCtrl;
-    wxTextCtrl *m_logWindow;
+    MyFrame(const wxChar *title);
+    virtual ~MyFrame();

 
 

-    MyFrame(const wxChar *title, int x, int y, int w, int h);
-    ~MyFrame();
+    void DoSize();

 
 

-public:
+protected:

     void OnSize(wxSizeEvent& event);
 
     void OnQuit(wxCommandEvent& event);
     void OnSize(wxSizeEvent& event);
 
     void OnQuit(wxCommandEvent& event);


@@ -90,12 +117,14 @@ public:
     void OnSmallIconView(wxCommandEvent& event);
     void OnSmallIconTextView(wxCommandEvent& event);
     void OnVirtualView(wxCommandEvent& event);
     void OnSmallIconView(wxCommandEvent& event);
     void OnSmallIconTextView(wxCommandEvent& event);
     void OnVirtualView(wxCommandEvent& event);

+    void OnSmallVirtualView(wxCommandEvent& event);

 
     void OnFocusLast(wxCommandEvent& event);
     void OnToggleFirstSel(wxCommandEvent& event);
     void OnDeselectAll(wxCommandEvent& event);
     void OnSelectAll(wxCommandEvent& event);
     void OnAdd(wxCommandEvent& event);
 
     void OnFocusLast(wxCommandEvent& event);
     void OnToggleFirstSel(wxCommandEvent& event);
     void OnDeselectAll(wxCommandEvent& event);
     void OnSelectAll(wxCommandEvent& event);
     void OnAdd(wxCommandEvent& event);

+    void OnEdit(wxCommandEvent& event);

     void OnDelete(wxCommandEvent& event);
     void OnDeleteAll(wxCommandEvent& event);
     void OnSort(wxCommandEvent& event);
     void OnDelete(wxCommandEvent& event);
     void OnDeleteAll(wxCommandEvent& event);
     void OnSort(wxCommandEvent& event);


@@ -106,24 +135,38 @@ public:
     void OnShowSelInfo(wxCommandEvent& event);
     void OnFreeze(wxCommandEvent& event);
     void OnThaw(wxCommandEvent& event);
     void OnShowSelInfo(wxCommandEvent& event);
     void OnFreeze(wxCommandEvent& event);
     void OnThaw(wxCommandEvent& event);

+    void OnToggleLines(wxCommandEvent& event);

 
     void OnUpdateShowColInfo(wxUpdateUIEvent& event);
 
     void OnUpdateShowColInfo(wxUpdateUIEvent& event);

+    void OnUpdateToggleMultiSel(wxUpdateUIEvent& event);

 
     wxImageList *m_imageListNormal;
     wxImageList *m_imageListSmall;
 
 
     wxImageList *m_imageListNormal;
     wxImageList *m_imageListSmall;
 

+    wxPanel *m_panel;
+    MyListCtrl *m_listCtrl;
+    wxTextCtrl *m_logWindow;
+

 private:
     // recreate the list control with the new flags
 private:
     // recreate the list control with the new flags

-    void RecreateList(long flags, bool withText = TRUE);
+    void RecreateList(long flags, bool withText = true);

 
     // fill the control with items depending on the view
     void InitWithListItems();
     void InitWithReportItems();
 
     // fill the control with items depending on the view
     void InitWithListItems();
     void InitWithReportItems();

-    void InitWithIconItems(bool withText, bool sameIcon = FALSE);
+    void InitWithIconItems(bool withText, bool sameIcon = false);

     void InitWithVirtualItems();
 
     void InitWithVirtualItems();
 

+    // return true if the control is not in virtual view, give an error message
+    // and return false if it is
+    bool CheckNonVirtual() const;
+
+

     wxLog *m_logOld;
 
     wxLog *m_logOld;
 

+    bool m_smallVirtual;
+
+    DECLARE_NO_COPY_CLASS(MyFrame)

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -131,22 +174,24 @@ private:
 // IDs for the menu commands
 enum
 {
 // IDs for the menu commands
 enum
 {

-    LIST_ABOUT,
-    LIST_QUIT,
+    LIST_ABOUT = wxID_ABOUT,
+    LIST_QUIT = wxID_EXIT,

 
 

-    LIST_LIST_VIEW,
+    LIST_LIST_VIEW = wxID_HIGHEST,

     LIST_ICON_VIEW,
     LIST_ICON_TEXT_VIEW,
     LIST_SMALL_ICON_VIEW,
     LIST_SMALL_ICON_TEXT_VIEW,
     LIST_REPORT_VIEW,
     LIST_VIRTUAL_VIEW,
     LIST_ICON_VIEW,
     LIST_ICON_TEXT_VIEW,
     LIST_SMALL_ICON_VIEW,
     LIST_SMALL_ICON_TEXT_VIEW,
     LIST_REPORT_VIEW,
     LIST_VIRTUAL_VIEW,

+    LIST_SMALL_VIRTUAL_VIEW,

 
     LIST_DESELECT_ALL,
     LIST_SELECT_ALL,
     LIST_DELETE_ALL,
     LIST_DELETE,
     LIST_ADD,
 
     LIST_DESELECT_ALL,
     LIST_SELECT_ALL,
     LIST_DELETE_ALL,
     LIST_DELETE,
     LIST_ADD,

+    LIST_EDIT,

     LIST_SORT,
     LIST_SET_FG_COL,
     LIST_SET_BG_COL,
     LIST_SORT,
     LIST_SET_FG_COL,
     LIST_SET_BG_COL,


@@ -157,7 +202,7 @@ enum
     LIST_FOCUS_LAST,
     LIST_FREEZE,
     LIST_THAW,
     LIST_FOCUS_LAST,
     LIST_FREEZE,
     LIST_THAW,

+    LIST_TOGGLE_LINES,

 
     LIST_CTRL                   = 1000
 };
 
     LIST_CTRL                   = 1000
 };

-