further simplifiy USE_NATIVE_HEADER_WINDOW checks

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 12420c5dde5ac5aa3a0721014e3ef85784a93f84..0d0b1ad1202f618a9b871ff56f57141700bc631a 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -63,7 +63,10 @@ static const int EXPANDER_MARGIN = 4;
 // wxDataViewHeaderWindow
 //-----------------------------------------------------------------------------
 
 // wxDataViewHeaderWindow
 //-----------------------------------------------------------------------------
 

-#define USE_NATIVE_HEADER_WINDOW    !defined(__WXUNIVERSAL__)
+// on wxMSW the header window (only that part however) can be made native!
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    #define USE_NATIVE_HEADER_WINDOW
+#endif

 
 //Below is the compare stuff
 //For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed
 
 //Below is the compare stuff
 //For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed


@@ -109,8 +112,7 @@ protected:
     void SendEvent(wxEventType type, unsigned int n);
 };
 
     void SendEvent(wxEventType type, unsigned int n);
 };
 

-// on wxMSW the header window (only that part however) can be made native!
-#if defined(__WXMSW__) && USE_NATIVE_HEADER_WINDOW
+#ifdef USE_NATIVE_HEADER_WINDOW

 
 #define COLUMN_WIDTH_OFFSET         2
 #define wxDataViewHeaderWindowMSW   wxDataViewHeaderWindow
 
 #define COLUMN_WIDTH_OFFSET         2
 #define wxDataViewHeaderWindowMSW   wxDataViewHeaderWindow


@@ -1265,7 +1267,7 @@ void wxDataViewHeaderWindowBase::SendEvent(wxEventType type, unsigned int n)
     parent->GetEventHandler()->ProcessEvent(le);
 }
 
     parent->GetEventHandler()->ProcessEvent(le);
 }
 

-#if defined(__WXMSW__) && USE_NATIVE_HEADER_WINDOW
+#ifdef USE_NATIVE_HEADER_WINDOW

 
 #ifndef HDS_DRAGDROP
     #define HDS_DRAGDROP 0x0040
 
 #ifndef HDS_DRAGDROP
     #define HDS_DRAGDROP 0x0040