Rework modal dialog code to not depend on now obsolete wxDIALOG_MODAL flag.

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

diff --git a/contrib/src/stc/ScintillaWX.h b/contrib/src/stc/ScintillaWX.h
index 3784f26254f93948d7aa3950c4edd970ff1e9c60..06b6fec31068053993c4c54cb812b32bc54a9525 100644 (file)
--- a/contrib/src/stc/ScintillaWX.h
+++ b/contrib/src/stc/ScintillaWX.h
@@ -99,6 +99,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();


@@ -124,6 +125,7 @@ public:
     virtual void NotifyChange();
     virtual void NotifyParent(SCNotification scn);
 
     virtual void NotifyChange();
     virtual void NotifyParent(SCNotification scn);
 

+    virtual void CancelModes();

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


@@ -139,9 +141,10 @@ 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(int key, bool shift, bool ctrl, bool alt, bool meta, 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);
     wxDragResult DoDragEnter(wxCoord x, wxCoord y, wxDragResult def);
 #if wxUSE_DRAG_AND_DROP
     bool DoDropText(long x, long y, const wxString& data);
     wxDragResult DoDragEnter(wxCoord x, wxCoord y, wxDragResult def);


@@ -155,15 +158,18 @@ public:
 
 
     // helpers
 
 
     // helpers

-    void FullPaint();
+    void FullPaint(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
     wxStyledTextCtrl*   stc;
 
 #if wxUSE_DRAG_AND_DROP