Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fixes for wxMSW/Univ

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-02-04 10:07:58 +00:00
parent 5d2d4a2ef2
commit 5d55031c21
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/generic/listctrl.h
View File

@@ -244,8 +244,9 @@ private:
// we need to return a special WM_GETDLGCODE value to process just the // we need to return a special WM_GETDLGCODE value to process just the
// arrows but let the other navigation characters through // arrows but let the other navigation characters through
#ifdef __WXMSW__ #if defined(__WXMSW__) && !defined(__WXWINCE__) && !defined(__WXUNIVERSAL__)
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual WXLRESULT
MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
#endif // __WXMSW__ #endif // __WXMSW__
WX_FORWARD_TO_SCROLL_HELPER() WX_FORWARD_TO_SCROLL_HELPER()

11
src/generic/listctrl.cpp
View File

@@ -56,6 +56,9 @@
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
#endif #endif
#if defined(__WXMSW__) && !defined(__WXWINCE__) && !defined(__WXUNIVERSAL__)
#define "wx/msw/wrapwin.h"
#endif
// NOTE: If using the wxListBox visual attributes works everywhere then this can // NOTE: If using the wxListBox visual attributes works everywhere then this can
// be removed, as well as the #else case below. // be removed, as well as the #else case below.
@@ -803,6 +806,8 @@ void wxListLineData::DrawInReportMode( wxDC *dc,
#if ( !defined(__WXGTK20__) && !defined(__WXMAC__) ) #if ( !defined(__WXGTK20__) && !defined(__WXMAC__) )
{ {
dc->DrawRectangle( rectHL ); dc->DrawRectangle( rectHL );
wxUnusedVar(current);
} }
#else #else
{ {
@@ -4361,24 +4366,22 @@ wxBorder wxGenericListCtrl::GetDefaultBorder() const
return wxBORDER_THEME; return wxBORDER_THEME;
} }
#ifdef __WXMSW__ #if defined(__WXMSW__) && !defined(__WXWINCE__) && !defined(__WXUNIVERSAL__)
WXLRESULT wxGenericListCtrl::MSWWindowProc(WXUINT nMsg, WXLRESULT wxGenericListCtrl::MSWWindowProc(WXUINT nMsg,
WXWPARAM wParam, WXWPARAM wParam,
WXLPARAM lParam) WXLPARAM lParam)
{ {
WXLRESULT rc = wxControl::MSWWindowProc(nMsg, wParam, lParam); WXLRESULT rc = wxControl::MSWWindowProc(nMsg, wParam, lParam);
#ifndef __WXWINCE__
// we need to process arrows ourselves for scrolling // we need to process arrows ourselves for scrolling
if ( nMsg == WM_GETDLGCODE ) if ( nMsg == WM_GETDLGCODE )
{ {
rc |= DLGC_WANTARROWS; rc |= DLGC_WANTARROWS;
} }
#endif
return rc; return rc;
} }
#endif #endif // __WXMSW__
wxSize wxGenericListCtrl::GetSizeAvailableForScrollTarget(const wxSize& size) wxSize wxGenericListCtrl::GetSizeAvailableForScrollTarget(const wxSize& size)
{ {