remove gtk_window_set_type_hint from GetTooltipColors, it's not necessary and GDK_WIN...

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

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 1fdd2515c53209caf22c490644c1641792659eee..76af113dd7640e279ef99dbb329f5afc555fad5a 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,46 +67,47 @@ 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
 
 
 #if wxUSE_POPUPWIN && wxSTC_USE_POPUP
 }
 #endif // wxUSE_DRAG_AND_DROP
 
 
 #if wxUSE_POPUPWIN && wxSTC_USE_POPUP

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

 #define wxSTCCallTipBase wxPopupWindow
 #define param2  wxBORDER_NONE  // popup's 2nd param is flags
 #else
 #define wxSTCCallTipBase wxPopupWindow
 #define param2  wxBORDER_NONE  // popup's 2nd param is flags
 #else

+#include "wx/frame.h"

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

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

 
 class wxSTCCallTip : public wxSTCCallTipBase {
 public:
 
 class wxSTCCallTip : public wxSTCCallTipBase {
 public:


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

+
+#endif // wxUSE_STC