mac paths updated

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

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 1fdd2515c53209caf22c490644c1641792659eee..62524ee92833d986d6ac563aabd112390a5fb45b 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -21,8 +21,12 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_STC

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

+    #include "wx/scrolbar.h"
+    #include "wx/menu.h"
+    #include "wx/timer.h"

 #endif // WX_PRECOMP
 
 #include "wx/textbuf.h"
 #endif // WX_PRECOMP
 
 #include "wx/textbuf.h"


@@ -33,6 +37,7 @@
 #include "ScintillaWX.h"
 #include "ExternalLexer.h"
 #include "wx/stc/stc.h"
 #include "ScintillaWX.h"
 #include "ExternalLexer.h"
 #include "wx/stc/stc.h"

+#include "wx/stc/private.h"

 #include "PlatWX.h"
 
 #ifdef __WXMSW__
 #include "PlatWX.h"
 
 #ifdef __WXMSW__


@@ -46,15 +51,15 @@
 class wxSTCTimer : public wxTimer {
 public:
     wxSTCTimer(ScintillaWX* swx) {
 class wxSTCTimer : public wxTimer {
 public:
     wxSTCTimer(ScintillaWX* swx) {

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

     }
 
     void Notify() {
     }
 
     void Notify() {

-        swx->DoTick();
+        m_swx->DoTick();

     }
 
 private:
     }
 
 private:

-    ScintillaWX* swx;
+    ScintillaWX* m_swx;

 };
 
 
 };
 
 


@@ -62,51 +67,50 @@ private:
 class wxStartDragTimer : public wxTimer {
 public:
     wxStartDragTimer(ScintillaWX* swx) {
 class wxStartDragTimer : public wxTimer {
 public:
     wxStartDragTimer(ScintillaWX* swx) {

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

     }
 
     void Notify() {
     }
 
     void Notify() {

-        swx->DoStartDrag();
+        m_swx->DoStartDrag();

     }
 
 private:
     }
 
 private:

-    ScintillaWX* swx;
+    ScintillaWX* m_swx;

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

-    return swx->DoDropText(x, y, data);
+    return m_swx->DoDropText(x, y, data);

 }
 
 wxDragResult  wxSTCDropTarget::OnEnter(wxCoord x, wxCoord y, wxDragResult def) {
 }
 
 wxDragResult  wxSTCDropTarget::OnEnter(wxCoord x, wxCoord y, wxDragResult def) {

-    return swx->DoDragEnter(x, y, def);
+    return m_swx->DoDragEnter(x, y, def);

 }
 
 wxDragResult  wxSTCDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def) {
 }
 
 wxDragResult  wxSTCDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def) {

-    return swx->DoDragOver(x, y, def);
+    return m_swx->DoDragOver(x, y, def);

 }
 
 void  wxSTCDropTarget::OnLeave() {
 }
 
 void  wxSTCDropTarget::OnLeave() {

-    swx->DoDragLeave();
+    m_swx->DoDragLeave();

 }
 #endif // wxUSE_DRAG_AND_DROP
 
 
 }
 #endif // wxUSE_DRAG_AND_DROP
 
 

-#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
-#include <wx/popupwin.h>
+#if wxUSE_POPUPWIN
+#include "wx/popupwin.h"

 #define wxSTCCallTipBase wxPopupWindow
 #define wxSTCCallTipBase wxPopupWindow

-#define param2  wxBORDER_NONE  // popup's 2nd param is flags

 #else
 #else

+#include "wx/frame.h"

 #define wxSTCCallTipBase wxFrame
 #define wxSTCCallTipBase wxFrame

-#define param2 -1 // wxWindow's 2nd param is ID

 #endif
 
 #endif
 

-#include <wx/dcbuffer.h>
+#include "wx/dcbuffer.h"

 
 class wxSTCCallTip : public wxSTCCallTipBase {
 public:
     wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx) :
 
 class wxSTCCallTip : public wxSTCCallTipBase {
 public:
     wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx) :

-#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
+#if wxUSE_POPUPWIN

         wxSTCCallTipBase(parent, wxBORDER_NONE),
 #else
         wxSTCCallTipBase(parent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize,
         wxSTCCallTipBase(parent, wxBORDER_NONE),
 #else
         wxSTCCallTipBase(parent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize,


@@ -120,10 +124,11 @@ public:
 #endif
           m_ct(ct), m_swx(swx), m_cx(wxDefaultCoord), m_cy(wxDefaultCoord)
         {
 #endif
           m_ct(ct), m_swx(swx), m_cx(wxDefaultCoord), m_cy(wxDefaultCoord)
         {

+            SetBackgroundStyle(wxBG_STYLE_CUSTOM);

         }
 
     ~wxSTCCallTip() {
         }
 
     ~wxSTCCallTip() {

-#if wxUSE_POPUPWIN && wxSTC_USE_POPUP && defined(__WXGTK__)
+#if wxUSE_POPUPWIN && defined(__WXGTK__)

         wxRect rect = GetRect();
         rect.x = m_cx;
         rect.y = m_cy;
         wxRect rect = GetRect();
         rect.x = m_cx;
         rect.y = m_cy;


@@ -135,7 +140,7 @@ public:
 
     void OnPaint(wxPaintEvent& WXUNUSED(evt))
     {
 
     void OnPaint(wxPaintEvent& WXUNUSED(evt))
     {

-        wxBufferedPaintDC dc(this);
+        wxAutoBufferedPaintDC dc(this);

         Surface* surfaceWindow = Surface::Allocate();
         surfaceWindow->Init(&dc, m_ct->wDraw.GetID());
         m_ct->PaintCT(surfaceWindow);
         Surface* surfaceWindow = Surface::Allocate();
         surfaceWindow->Init(&dc, m_ct->wDraw.GetID());
         m_ct->PaintCT(surfaceWindow);


@@ -173,7 +178,7 @@ public:
         wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags);
     }
 
         wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags);
     }
 

-#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
+#if wxUSE_POPUPWIN

 #else
     virtual bool Show( bool show = true )
     {
 #else
     virtual bool Show( bool show = true )
     {


@@ -328,7 +333,7 @@ void ScintillaWX::DoStartDrag() {
         result = source.DoDragDrop(evt.GetDragAllowMove());
         if (result == wxDragMove && dropWentOutside)
             ClearSelection();
         result = source.DoDragDrop(evt.GetDragAllowMove());
         if (result == wxDragMove && dropWentOutside)
             ClearSelection();

-        inDragDrop = false;
+        inDragDrop = ddNone;

         SetDragPosition(invalidPosition);
     }
 #endif // wxUSE_DRAG_AND_DROP
         SetDragPosition(invalidPosition);
     }
 #endif // wxUSE_DRAG_AND_DROP


@@ -1123,7 +1128,7 @@ void ScintillaWX::ClipChildren(wxDC& WXUNUSED(dc), PRectangle WXUNUSED(rect))
 //     if (ct.inCallTipMode) {
 //         wxSTCCallTip* tip = (wxSTCCallTip*)ct.wCallTip.GetID();
 //         wxRect childRect = tip->GetRect();
 //     if (ct.inCallTipMode) {
 //         wxSTCCallTip* tip = (wxSTCCallTip*)ct.wCallTip.GetID();
 //         wxRect childRect = tip->GetRect();

-// #if wxUSE_POPUPWIN && wxSTC_USE_POPUP
+// #if wxUSE_POPUPWIN

 //         childRect.SetPosition(tip->GetMyPosition());
 // #endif
 //         rgn.Subtract(childRect);
 //         childRect.SetPosition(tip->GetMyPosition());
 // #endif
 //         rgn.Subtract(childRect);


@@ -1143,3 +1148,5 @@ bool ScintillaWX::GetUseAntiAliasing() {
 
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------

+
+#endif // wxUSE_STC