Fit the generic preferences editor dialog to its pages size initially.

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

diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h
index 3784f26254f93948d7aa3950c4edd970ff1e9c60..a7ac8023e084f9e464ac0ab4cf7790936caa4f6c 100644 (file)
--- a/src/stc/ScintillaWX.h
+++ b/src/stc/ScintillaWX.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////

-// Name:        ScintillaWX.h
-// Purpose:     A wxWindows implementation of Scintilla.  A class derived
+// Name:        src/stc/ScintillaWX.h
+// Purpose:     A wxWidgets implementation of Scintilla.  A class derived

 //              from ScintillaBase that uses the "wx platform" defined in
 //              PlatWX.cpp.  This class is one end of a bridge between
 //              the wx world and the Scintilla world.  It needs a peer
 //              from ScintillaBase that uses the "wx platform" defined in
 //              PlatWX.cpp.  This class is one end of a bridge between
 //              the wx world and the Scintilla world.  It needs a peer


@@ -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"

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


@@ -23,16 +24,24 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

+#include <vector>
+#include <map>

 
 

+// These are all Scintilla headers

 #include "Platform.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"
 #ifdef SCI_LEXER
 #include "SciLexer.h"

-#include "PropSet.h"
+#include "PropSetSimple.h"
+#include "ILexer.h"
+#include "LexerModule.h"
+#include "LexAccessor.h"

 #include "Accessor.h"
 #include "Accessor.h"

-#include "KeyWords.h"
+#include "WordList.h"

 #endif
 #include "ContractionState.h"
 #include "SVector.h"
 #endif
 #include "ContractionState.h"
 #include "SVector.h"


@@ -40,30 +49,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 +85,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 +94,7 @@ public:
     void OnLeave();
 
 private:
     void OnLeave();
 
 private:

-    ScintillaWX* swx;
+    ScintillaWX* m_swx;

 };
 #endif
 
 };
 #endif
 


@@ -99,6 +110,7 @@ public:
     virtual void Initialise();
     virtual void Finalise();
     virtual void StartDrag();
     virtual void Initialise();
     virtual void Finalise();
     virtual void StartDrag();

+    virtual bool SetIdle(bool on);

     virtual void SetTicking(bool on);
     virtual void SetMouseCapture(bool on);
     virtual bool HaveMouseCapture();
     virtual void SetTicking(bool on);
     virtual void SetMouseCapture(bool on);
     virtual bool HaveMouseCapture();


@@ -114,16 +126,19 @@ 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 NotifyChange();
     virtual void NotifyParent(SCNotification scn);
 

+    virtual void CancelModes();
+
+    virtual void UpdateSystemCaret();

 
     // Event delegates
     void DoPaint(wxDC* dc, wxRect rect);
 
     // Event delegates
     void DoPaint(wxDC* dc, wxRect rect);


@@ -139,8 +154,9 @@ 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* consumed);
+    int  DoKeyDown(const wxKeyEvent& event, bool* consumed);

     void DoTick() { Tick(); }
     void DoTick() { Tick(); }

+    void DoOnIdle(wxIdleEvent& evt);

 
 #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);


@@ -156,23 +172,37 @@ public:
 
     // helpers
     void FullPaint();
 
     // helpers
     void FullPaint();

+    void FullPaintDC(wxDC* dc);

     bool CanPaste();
     bool GetHideSelection() { return hideSelection; }
     void DoScrollToLine(int line);
     void DoScrollToColumn(int column);
     void ClipChildren(wxDC& dc, PRectangle rect);
     bool CanPaste();
     bool GetHideSelection() { return hideSelection; }
     void DoScrollToLine(int line);
     void DoScrollToColumn(int column);
     void ClipChildren(wxDC& dc, PRectangle rect);

+    void SetUseAntiAliasing(bool useAA);
+    bool GetUseAntiAliasing();

 
 private:
     bool                capturedMouse;
 
 private:
     bool                capturedMouse;

+    bool                focusEvent;

     wxStyledTextCtrl*   stc;
 
 #if wxUSE_DRAG_AND_DROP
     wxSTCDropTarget*    dropTarget;
     wxDragResult        dragResult;
 #endif
     wxStyledTextCtrl*   stc;
 
 #if wxUSE_DRAG_AND_DROP
     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;
 };