Move SetDefaultTimeout to wxProtocol and set it to 60 seconds for both wxHTTP and...

[wxWidgets.git] / src / msw / headerctrl.cpp

diff --git a/src/msw/headerctrl.cpp b/src/msw/headerctrl.cpp
index 2fb4dea8c1eb5f4198dd7a591f7a78a74ed54438..21d83f63888f3360c4d5a9e271d14b362927f640 100644 (file)
--- a/src/msw/headerctrl.cpp
+++ b/src/msw/headerctrl.cpp
@@ -23,6 +23,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_HEADERCTRL
+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
 #endif // WX_PRECOMP
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 #endif // WX_PRECOMP


@@ -78,7 +80,7 @@ WXDWORD wxHeaderCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
 
 {
     WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
 

-    if ( style & wxHD_DRAGDROP )
+    if ( style & wxHD_ALLOW_REORDER )

         msStyle |= HDS_DRAGDROP;
 
     // the control looks nicer with these styles and there doesn't seem to be
         msStyle |= HDS_DRAGDROP;
 
     // the control looks nicer with these styles and there doesn't seem to be


@@ -660,3 +662,5 @@ bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 }
 
 #endif // wxHAS_GENERIC_HEADERCTRL
 }
 
 #endif // wxHAS_GENERIC_HEADERCTRL

+
+#endif // wxUSE_HEADERCTRL