no changes, just remove #if'd out code

[wxWidgets.git] / include / wx / generic / listctrl.h

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index 47e28583d7d9c4565d66fd664d99e028faaafe42..9fdc58788d9bc9e12832b82da2c0c3515d8162e0 100644 (file)
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -20,11 +20,6 @@ class WXDLLIMPEXP_FWD_CORE wxImageList;
 class WXDLLIMPEXP_FWD_CORE wxDropTarget;
 #endif
 
 class WXDLLIMPEXP_FWD_CORE wxDropTarget;
 #endif
 

-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-

 //-----------------------------------------------------------------------------
 // internal classes
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // internal classes
 //-----------------------------------------------------------------------------


@@ -45,21 +40,21 @@ public:
     {
         Init();
     }
     {
         Init();
     }

-    
+

     wxGenericListCtrl( wxWindow *parent,
                 wxWindowID winid = wxID_ANY,
                 const wxPoint &pos = wxDefaultPosition,
                 const wxSize &size = wxDefaultSize,
                 long style = wxLC_ICON,
                 const wxValidator& validator = wxDefaultValidator,
     wxGenericListCtrl( wxWindow *parent,
                 wxWindowID winid = wxID_ANY,
                 const wxPoint &pos = wxDefaultPosition,
                 const wxSize &size = wxDefaultSize,
                 long style = wxLC_ICON,
                 const wxValidator& validator = wxDefaultValidator,

-                const wxString &name = wxListCtrlNameStr) 
+                const wxString &name = wxListCtrlNameStr)

             : wxScrollHelper(this)
     {
         Create(parent, winid, pos, size, style, validator, name);
     }
             : wxScrollHelper(this)
     {
         Create(parent, winid, pos, size, style, validator, name);
     }

-    
+

     virtual ~wxGenericListCtrl();
     virtual ~wxGenericListCtrl();

-    
+

     void Init();
 
     bool Create( wxWindow *parent,
     void Init();
 
     bool Create( wxWindow *parent,


@@ -143,7 +138,7 @@ public:
     long InsertColumn( long col, const wxString& heading,
                        int format = wxLIST_FORMAT_LEFT, int width = -1 );
     bool ScrollList( int dx, int dy );
     long InsertColumn( long col, const wxString& heading,
                        int format = wxLIST_FORMAT_LEFT, int width = -1 );
     bool ScrollList( int dx, int dy );

-    bool SortItems( wxListCtrlCompare fn, long data );
+    bool SortItems( wxListCtrlCompare fn, wxIntPtr data );

     bool Update( long item );
     // Must provide overload to avoid hiding it (and warnings about it)
     virtual void Update() { wxControl::Update(); }
     bool Update( long item );
     // Must provide overload to avoid hiding it (and warnings about it)
     virtual void Update() { wxControl::Update(); }


@@ -249,8 +244,9 @@ private:
 
     // we need to return a special WM_GETDLGCODE value to process just the
     // arrows but let the other navigation characters through
 
     // we need to return a special WM_GETDLGCODE value to process just the
     // arrows but let the other navigation characters through

-#ifdef __WXMSW__
-    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+#if defined(__WXMSW__) && !defined(__WXWINCE__) && !defined(__WXUNIVERSAL__)
+    virtual WXLRESULT
+    MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

 #endif // __WXMSW__
 
     WX_FORWARD_TO_SCROLL_HELPER()
 #endif // __WXMSW__
 
     WX_FORWARD_TO_SCROLL_HELPER()


@@ -281,7 +277,7 @@ public:
     : wxGenericListCtrl(parent, winid, pos, size, style, validator, name)
     {
     }
     : wxGenericListCtrl(parent, winid, pos, size, style, validator, name)
     {
     }

-    
+

 };
 #endif // !__WXMSW__ || __WXUNIVERSAL__
 
 };
 #endif // !__WXMSW__ || __WXUNIVERSAL__