add parentheses for && inside || to fix g++ 4.3 warning

[wxWidgets.git] / src / stc / ScintillaWX.h

diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h
index 26e9c239e58361882c97cd51d3ea3d6e3e7ce469..576229389b994ff54e4e649ca77ee31709827dbe 100644 (file)
--- a/src/stc/ScintillaWX.h
+++ b/src/stc/ScintillaWX.h
@@ -36,8 +36,10 @@
 #include "Accessor.h"
 #include "KeyWords.h"
 #endif
 #include "Accessor.h"
 #include "KeyWords.h"
 #endif

+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"

 #include "ContractionState.h"
 #include "ContractionState.h"

-#include "SVector.h"

 #include "CellBuffer.h"
 #include "CallTip.h"
 #include "KeyMap.h"
 #include "CellBuffer.h"
 #include "CallTip.h"
 #include "KeyMap.h"


@@ -46,7 +48,9 @@
 #include "Style.h"
 #include "ViewStyle.h"
 #include "AutoComplete.h"
 #include "Style.h"
 #include "ViewStyle.h"
 #include "AutoComplete.h"

+#include "Decoration.h"

 #include "Document.h"
 #include "Document.h"

+#include "PositionCache.h"

 #include "Editor.h"
 #include "ScintillaBase.h"
 
 #include "Editor.h"
 #include "ScintillaBase.h"
 


@@ -144,7 +148,6 @@ public:
     int  DoKeyDown(const wxKeyEvent& event, bool* consumed);
     void DoTick() { Tick(); }
     void DoOnIdle(wxIdleEvent& evt);
     int  DoKeyDown(const wxKeyEvent& event, bool* consumed);
     void DoTick() { Tick(); }
     void DoOnIdle(wxIdleEvent& evt);

-    void DoStartDrag();

 
 #if wxUSE_DRAG_AND_DROP
     bool DoDropText(long x, long y, const wxString& data);
 
 #if wxUSE_DRAG_AND_DROP
     bool DoDropText(long x, long y, const wxString& data);


@@ -176,7 +179,6 @@ private:
 #if wxUSE_DRAG_AND_DROP
     wxSTCDropTarget*    dropTarget;
     wxDragResult        dragResult;
 #if wxUSE_DRAG_AND_DROP
     wxSTCDropTarget*    dropTarget;
     wxDragResult        dragResult;

-    wxTimer*            startDragTimer;

 #endif
 
     int                 wheelRotation;
 #endif
 
     int                 wheelRotation;