don't use wxStaticCast to wxBookCtrlBase -- it doesn't work

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

diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index 97173fd4f7c4122a2005499eeebfb4a1789b83b7..07d8349199d693e5284c15f1cc56893547b7b527 100644 (file)
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -14,11 +14,11 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#include <wx/wx.h>
-#include <wx/textbuf.h>
-#include <wx/dataobj.h>
-#include <wx/clipbrd.h>
-#include <wx/dnd.h>
+#include "wx/wx.h"
+#include "wx/textbuf.h"
+#include "wx/dataobj.h"
+#include "wx/clipbrd.h"
+#include "wx/dnd.h"

 
 #include "ScintillaWX.h"
 #include "ExternalLexer.h"
 
 #include "ScintillaWX.h"
 #include "ExternalLexer.h"


@@ -27,7 +27,7 @@
 
 #ifdef __WXMSW__
     // GetHwndOf()
 
 #ifdef __WXMSW__
     // GetHwndOf()

-    #include <wx/msw/private.h>
+    #include "wx/msw/private.h"

 #endif
 
 //----------------------------------------------------------------------
 #endif
 
 //----------------------------------------------------------------------


@@ -154,6 +154,7 @@ END_EVENT_TABLE()
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

+#if wxUSE_DATAOBJ

 static wxTextFileType wxConvertEOLMode(int scintillaMode)
 {
     wxTextFileType type;
 static wxTextFileType wxConvertEOLMode(int scintillaMode)
 {
     wxTextFileType type;


@@ -177,6 +178,7 @@ static wxTextFileType wxConvertEOLMode(int scintillaMode)
     }
     return type;
 }
     }
     return type;
 }

+#endif // wxUSE_DATAOBJ

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


@@ -439,6 +441,7 @@ void ScintillaWX::Paste() {
     pdoc->BeginUndoAction();
     ClearSelection();
 
     pdoc->BeginUndoAction();
     ClearSelection();
 

+#if wxUSE_DATAOBJ

     wxTextDataObject data;
     bool gotData = false;
 
     wxTextDataObject data;
     bool gotData = false;
 


@@ -455,6 +458,7 @@ void ScintillaWX::Paste() {
         pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);
     }
         pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);
     }

+#endif // wxUSE_DATAOBJ

 
     pdoc->EndUndoAction();
     NotifyChange();
 
     pdoc->EndUndoAction();
     NotifyChange();


@@ -463,16 +467,21 @@ void ScintillaWX::Paste() {
 
 
 void ScintillaWX::CopyToClipboard(const SelectionText& st) {
 
 
 void ScintillaWX::CopyToClipboard(const SelectionText& st) {

+#if wxUSE_CLIPBOARD

     if (wxTheClipboard->Open()) {
         wxTheClipboard->UsePrimarySelection(false);
         wxString text = wxTextBuffer::Translate(stc2wx(st.s, st.len-1));
         wxTheClipboard->SetData(new wxTextDataObject(text));
         wxTheClipboard->Close();
     }
     if (wxTheClipboard->Open()) {
         wxTheClipboard->UsePrimarySelection(false);
         wxString text = wxTextBuffer::Translate(stc2wx(st.s, st.len-1));
         wxTheClipboard->SetData(new wxTextDataObject(text));
         wxTheClipboard->Close();
     }

+#else
+    wxUnusedVar(st);
+#endif // wxUSE_CLIPBOARD

 }
 
 
 bool ScintillaWX::CanPaste() {
 }
 
 
 bool ScintillaWX::CanPaste() {

+#if wxUSE_CLIPBOARD

     bool canPaste = false;
     bool didOpen;
 
     bool canPaste = false;
     bool didOpen;
 


@@ -489,6 +498,9 @@ bool ScintillaWX::CanPaste() {
         }
     }
     return canPaste;
         }
     }
     return canPaste;

+#else
+    return false;
+#endif // wxUSE_CLIPBOARD

 }
 
 void ScintillaWX::CreateCallTipWindow(PRectangle) {
 }
 
 void ScintillaWX::CreateCallTipWindow(PRectangle) {