Slightly improve wx[Generic]RichMessageDialog layout.

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

diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h
index a902db5ed64ffcd317152ec79bf71feea6ae4410..dfb9b6965b11a3f87be04d572b02d77e7c2bcd2d 100644 (file)
--- a/src/stc/ScintillaWX.h
+++ b/src/stc/ScintillaWX.h
@@ -11,11 +11,12 @@
 // Created:     13-Jan-2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 by Total Control Software
 // Created:     13-Jan-2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 by Total Control Software

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __ScintillaWX_h__
 #define __ScintillaWX_h__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __ScintillaWX_h__
 #define __ScintillaWX_h__

+#include "wx/defs.h"

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 


@@ -25,9 +26,11 @@
 #include <string.h>
 
 #include "Platform.h"
 #include <string.h>
 
 #include "Platform.h"

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

 #include "Scintilla.h"
 #include "Scintilla.h"

-#include "XPM.h"
+#include "ScintillaWidget.h"

 #ifdef SCI_LEXER
 #include "SciLexer.h"
 #include "PropSet.h"
 #ifdef SCI_LEXER
 #include "SciLexer.h"
 #include "PropSet.h"


@@ -40,30 +43,32 @@
 #include "CallTip.h"
 #include "KeyMap.h"
 #include "Indicator.h"
 #include "CallTip.h"
 #include "KeyMap.h"
 #include "Indicator.h"

+#include "XPM.h"

 #include "LineMarker.h"
 #include "Style.h"
 #include "LineMarker.h"
 #include "Style.h"

-#include "ViewStyle.h"

 #include "AutoComplete.h"
 #include "AutoComplete.h"

+#include "ViewStyle.h"
+#include "CharClassify.h"
+#include "Decoration.h"

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

+#include "Selection.h"
+#include "PositionCache.h"

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

+#include "PropSetSimple.h"

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

-#include <wx/wx.h>
-#include <wx/dataobj.h>
-#include <wx/clipbrd.h>
-#include <wx/dnd.h>
+#ifdef __WXMSW__
+#include "wx/msw/wrapwin.h"                     // HBITMAP
+#endif
+#if wxUSE_DRAG_AND_DROP
+#include "wx/timer.h"
+#endif

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-#ifdef WXMAKINGDLL_STC
-    #define WXDLLIMPEXP_STC WXEXPORT
-#elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_STC WXIMPORT
-#else // not making nor using DLL
-    #define WXDLLIMPEXP_STC
-#endif

 
 

-class WXDLLIMPEXP_STC wxStyledTextCtrl;           // forward
+class WXDLLIMPEXP_FWD_CORE wxDC;
+class WXDLLIMPEXP_FWD_STC wxStyledTextCtrl;           // forward

 class ScintillaWX;
 
 
 class ScintillaWX;
 
 


@@ -74,7 +79,7 @@ class ScintillaWX;
 class wxSTCDropTarget : public wxTextDropTarget {
 public:
     void SetScintilla(ScintillaWX* swx) {
 class wxSTCDropTarget : public wxTextDropTarget {
 public:
     void SetScintilla(ScintillaWX* swx) {

-        this->swx = swx;
+        m_swx = swx;

     }
 
     bool OnDropText(wxCoord x, wxCoord y, const wxString& data);
     }
 
     bool OnDropText(wxCoord x, wxCoord y, const wxString& data);


@@ -83,7 +88,7 @@ public:
     void OnLeave();
 
 private:
     void OnLeave();
 
 private:

-    ScintillaWX* swx;
+    ScintillaWX* m_swx;

 };
 #endif
 
 };
 #endif
 


@@ -115,18 +120,20 @@ public:
     virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true);
     virtual void ClaimSelection();
 
     virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true);
     virtual void ClaimSelection();
 

-    virtual long DefWndProc(unsigned int iMessage,
-                            unsigned long wParam,
-                            long lParam);
-    virtual long WndProc(unsigned int iMessage,
-                         unsigned long wParam,
-                         long lParam);
+    virtual sptr_t DefWndProc(unsigned int iMessage,
+                              uptr_t wParam,
+                              sptr_t lParam);
+    virtual sptr_t WndProc(unsigned int iMessage,
+                           uptr_t wParam,
+                           sptr_t lParam);

 
     virtual void NotifyChange();
     virtual void NotifyParent(SCNotification scn);
 
     virtual void CancelModes();
 
 
     virtual void NotifyChange();
     virtual void NotifyParent(SCNotification scn);
 
     virtual void CancelModes();
 

+    virtual void UpdateSystemCaret();
+

     // Event delegates
     void DoPaint(wxDC* dc, wxRect rect);
     void DoHScroll(int type, int pos);
     // Event delegates
     void DoPaint(wxDC* dc, wxRect rect);
     void DoHScroll(int type, int pos);


@@ -141,7 +148,7 @@ public:
     void DoMiddleButtonUp(Point pt);
     void DoMouseWheel(int rotation, int delta, int linesPerAction, int ctrlDown, bool isPageScroll);
     void DoAddChar(int key);
     void DoMiddleButtonUp(Point pt);
     void DoMouseWheel(int rotation, int delta, int linesPerAction, int ctrlDown, bool isPageScroll);
     void DoAddChar(int key);

-    int  DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool meta, bool* consumed);
+    int  DoKeyDown(const wxKeyEvent& event, bool* consumed);

     void DoTick() { Tick(); }
     void DoOnIdle(wxIdleEvent& evt);
 
     void DoTick() { Tick(); }
     void DoOnIdle(wxIdleEvent& evt);
 


@@ -176,9 +183,19 @@ private:
     wxSTCDropTarget*    dropTarget;
     wxDragResult        dragResult;
 #endif
     wxSTCDropTarget*    dropTarget;
     wxDragResult        dragResult;
 #endif

-    int                 wheelRotation;

 
 

+    int                 wheelRotation;

 
 

+    // For use in creating a system caret
+    bool HasCaretSizeChanged();
+    bool CreateSystemCaret();
+    bool DestroySystemCaret();
+#ifdef __WXMSW__
+    HBITMAP sysCaretBitmap;
+    int sysCaretWidth;
+    int sysCaretHeight;
+#endif
+   

     friend class wxSTCCallTip;
 };
 
     friend class wxSTCCallTip;
 };