Fixed bug in setting/getting value for wxComboBox. Read-only status

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

diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index f1ebd651172fc32612edf5cf1010a9ea1d8ad2ec..c12d3ff2691a4da890f9bc9885dd521d313b2add 100644 (file)
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 // Name:        ScintillaWX.cxx
 ////////////////////////////////////////////////////////////////////////////
 // Name:        ScintillaWX.cxx

-// Purpose:     A wxWindows implementation of Scintilla.  A class derived
+// Purpose:     A wxWidgets implementation of Scintilla.  A class derived

 //              from ScintillaBase that uses the "wx platform" defined in
 //              PlatformWX.cxx  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
 //              PlatformWX.cxx  This class is one end of a bridge between
 //              the wx world and the Scintilla world.  It needs a peer


@@ -58,11 +58,6 @@ void  wxSTCDropTarget::OnLeave() {
 #endif
 
 
 #endif
 
 

-#ifdef __WXGTK__
-#undef wxSTC_USE_POPUP
-#define wxSTC_USE_POPUP 0
-#endif
-

 #if wxUSE_POPUPWIN && wxSTC_USE_POPUP
 #include <wx/popupwin.h>
 #define wxSTCCallTipBase wxPopupWindow
 #if wxUSE_POPUPWIN && wxSTC_USE_POPUP
 #include <wx/popupwin.h>
 #define wxSTCCallTipBase wxPopupWindow


@@ -72,21 +67,29 @@ void  wxSTCDropTarget::OnLeave() {
 #define param2 -1 // wxWindow's 2nd param is ID
 #endif
 
 #define param2 -1 // wxWindow's 2nd param is ID
 #endif
 

+#include <wx/dcbuffer.h>
+

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

-          m_ct(ct), m_swx(swx)
+          m_ct(ct), m_swx(swx), m_cx(wxDefaultCoord), m_cy(wxDefaultCoord)

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

+#if wxUSE_POPUPWIN && wxSTC_USE_POPUP && defined(__WXGTK__)
+        wxRect rect = GetRect();
+        rect.x = m_cx;
+        rect.y = m_cy;
+        GetParent()->Refresh(false, &rect);
+#endif

     }
 
     }
 

-    bool AcceptsFocus() const { return FALSE; }
+    bool AcceptsFocus() const { return false; }

 
     void OnPaint(wxPaintEvent& WXUNUSED(evt)) {
 
     void OnPaint(wxPaintEvent& WXUNUSED(evt)) {

-        wxPaintDC dc(this);
+        wxBufferedPaintDC 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);


@@ -110,17 +113,26 @@ public:
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO) {
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO) {

-        if (x != -1)
+        if (x != wxDefaultCoord) {
+            m_cx = x;

             GetParent()->ClientToScreen(&x, NULL);
             GetParent()->ClientToScreen(&x, NULL);

-        if (y != -1)
+        }
+        if (y != wxDefaultCoord) {
+            m_cy = y;

             GetParent()->ClientToScreen(NULL, &y);
             GetParent()->ClientToScreen(NULL, &y);

+        }

         wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags);
     }
 #endif
 
         wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags);
     }
 #endif
 

+    wxPoint GetMyPosition() {
+        return wxPoint(m_cx, m_cy);
+    }
+

 private:
     CallTip*      m_ct;
     ScintillaWX*  m_swx;
 private:
     CallTip*      m_ct;
     ScintillaWX*  m_swx;

+    int           m_cx, m_cy;

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -131,6 +143,33 @@ BEGIN_EVENT_TABLE(wxSTCCallTip, wxSTCCallTipBase)
 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 

+//----------------------------------------------------------------------
+
+static wxTextFileType wxConvertEOLMode(int scintillaMode)
+{
+    wxTextFileType type;
+
+    switch (scintillaMode) {
+        case wxSTC_EOL_CRLF:
+            type = wxTextFileType_Dos;
+            break;
+
+        case wxSTC_EOL_CR:
+            type = wxTextFileType_Mac;
+            break;
+
+        case wxSTC_EOL_LF:
+            type = wxTextFileType_Unix;
+            break;
+
+        default:
+            type = wxTextBuffer::typeDefault;
+            break;
+    }
+    return type;
+}
+
+

 //----------------------------------------------------------------------
 // Constructor/Destructor
 
 //----------------------------------------------------------------------
 // Constructor/Destructor
 


@@ -160,7 +199,11 @@ void ScintillaWX::Initialise() {
     dropTarget->SetScintilla(this);
     stc->SetDropTarget(dropTarget);
 #endif
     dropTarget->SetScintilla(this);
     stc->SetDropTarget(dropTarget);
 #endif

-    vs.extraFontFlag = true;
+#ifdef __WXMAC__
+    vs.extraFontFlag = false;  // UseAntiAliasing
+#else
+    vs.extraFontFlag = true;   // UseAntiAliasing
+#endif

 }
 
 
 }
 
 


@@ -179,7 +222,7 @@ void ScintillaWX::StartDrag() {
     wxStyledTextEvent evt(wxEVT_STC_START_DRAG, stc->GetId());
     evt.SetEventObject(stc);
     evt.SetDragText(dragText);
     wxStyledTextEvent evt(wxEVT_STC_START_DRAG, stc->GetId());
     evt.SetEventObject(stc);
     evt.SetDragText(dragText);

-    evt.SetDragAllowMove(TRUE);
+    evt.SetDragAllowMove(true);

     evt.SetPosition(wxMin(stc->GetSelectionStart(),
                           stc->GetSelectionEnd()));
     stc->GetEventHandler()->ProcessEvent(evt);
     evt.SetPosition(wxMin(stc->GetSelectionStart(),
                           stc->GetSelectionEnd()));
     stc->GetEventHandler()->ProcessEvent(evt);


@@ -191,11 +234,11 @@ void ScintillaWX::StartDrag() {
         wxDragResult        result;
 
         source.SetData(data);
         wxDragResult        result;
 
         source.SetData(data);

-        dropWentOutside = TRUE;
+        dropWentOutside = true;

         result = source.DoDragDrop(evt.GetDragAllowMove());
         if (result == wxDragMove && dropWentOutside)
             ClearSelection();
         result = source.DoDragDrop(evt.GetDragAllowMove());
         if (result == wxDragMove && dropWentOutside)
             ClearSelection();

-        inDragDrop = FALSE;
+        inDragDrop = false;

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


@@ -205,18 +248,18 @@ void ScintillaWX::StartDrag() {
 bool ScintillaWX::SetIdle(bool on) {
     if (idler.state != on) {
         // connect or disconnect the EVT_IDLE handler
 bool ScintillaWX::SetIdle(bool on) {
     if (idler.state != on) {
         // connect or disconnect the EVT_IDLE handler

-        if (on) 
-            stc->Connect(-1, wxEVT_IDLE,
+        if (on)
+            stc->Connect(wxID_ANY, wxEVT_IDLE,

                          (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);
         else
                          (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);
         else

-            stc->Disconnect(-1, wxEVT_IDLE,
+            stc->Disconnect(wxID_ANY, wxEVT_IDLE,

                             (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);
         idler.state = on;
     }
     return idler.state;
 }
 
                             (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);
         idler.state = on;
     }
     return idler.state;
 }
 

-    
+

 void ScintillaWX::SetTicking(bool on) {
     wxSTCTimer* steTimer;
     if (timer.ticking != on) {
 void ScintillaWX::SetTicking(bool on) {
     wxSTCTimer* steTimer;
     if (timer.ticking != on) {


@@ -382,15 +425,17 @@ void ScintillaWX::Paste() {
     ClearSelection();
 
     wxTextDataObject data;
     ClearSelection();
 
     wxTextDataObject data;

-    bool gotData = FALSE;
+    bool gotData = false;

 
     if (wxTheClipboard->Open()) {
 
     if (wxTheClipboard->Open()) {

-        wxTheClipboard->UsePrimarySelection(FALSE);
+        wxTheClipboard->UsePrimarySelection(false);

         gotData = wxTheClipboard->GetData(data);
         wxTheClipboard->Close();
     }
     if (gotData) {
         gotData = wxTheClipboard->GetData(data);
         wxTheClipboard->Close();
     }
     if (gotData) {

-        wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText());
+        wxString   text = wxTextBuffer::Translate(data.GetText(),
+                                                  wxConvertEOLMode(pdoc->eolMode));
+        wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);

         int        len = strlen(buf);
         pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);
         int        len = strlen(buf);
         pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);


@@ -404,7 +449,7 @@ void ScintillaWX::Paste() {
 
 void ScintillaWX::CopyToClipboard(const SelectionText& st) {
     if (wxTheClipboard->Open()) {
 
 void ScintillaWX::CopyToClipboard(const SelectionText& st) {
     if (wxTheClipboard->Open()) {

-        wxTheClipboard->UsePrimarySelection(FALSE);
+        wxTheClipboard->UsePrimarySelection(false);

         wxString text = wxTextBuffer::Translate(stc2wx(st.s, st.len));
         wxTheClipboard->SetData(new wxTextDataObject(text));
         wxTheClipboard->Close();
         wxString text = wxTextBuffer::Translate(stc2wx(st.s, st.len));
         wxTheClipboard->SetData(new wxTextDataObject(text));
         wxTheClipboard->Close();


@@ -413,7 +458,7 @@ void ScintillaWX::CopyToClipboard(const SelectionText& st) {
 
 
 bool ScintillaWX::CanPaste() {
 
 
 bool ScintillaWX::CanPaste() {

-    bool canPaste = FALSE;
+    bool canPaste = false;

     bool didOpen;
 
     if (Editor::CanPaste()) {
     bool didOpen;
 
     if (Editor::CanPaste()) {


@@ -422,7 +467,7 @@ bool ScintillaWX::CanPaste() {
             wxTheClipboard->Open();
 
         if (wxTheClipboard->IsOpened()) {
             wxTheClipboard->Open();
 
         if (wxTheClipboard->IsOpened()) {

-            wxTheClipboard->UsePrimarySelection(FALSE);
+            wxTheClipboard->UsePrimarySelection(false);

             canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
             if (didOpen)
                 wxTheClipboard->Close();
             canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
             if (didOpen)
                 wxTheClipboard->Close();


@@ -463,10 +508,10 @@ void ScintillaWX::ClaimSelection() {
         SelectionText st;
         CopySelectionRange(&st);
         if (wxTheClipboard->Open()) {
         SelectionText st;
         CopySelectionRange(&st);
         if (wxTheClipboard->Open()) {

-            wxTheClipboard->UsePrimarySelection(TRUE);
+            wxTheClipboard->UsePrimarySelection(true);

             wxString text = stc2wx(st.s, st.len);
             wxTheClipboard->SetData(new wxTextDataObject(text));
             wxString text = stc2wx(st.s, st.len);
             wxTheClipboard->SetData(new wxTextDataObject(text));

-            wxTheClipboard->UsePrimarySelection(FALSE);
+            wxTheClipboard->UsePrimarySelection(false);

             wxTheClipboard->Close();
         }
     }
             wxTheClipboard->Close();
         }
     }


@@ -516,7 +561,7 @@ long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lPar
       }
 
 #ifdef SCI_LEXER
       }
 
 #ifdef SCI_LEXER

-       case SCI_LOADLEXERLIBRARY:
+      case SCI_LOADLEXERLIBRARY:

             LexerManager::GetInstance()->Load((const char*)lParam);
             break;
 #endif
             LexerManager::GetInstance()->Load((const char*)lParam);
             break;
 #endif


@@ -543,14 +588,15 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
     dc->BeginDrawing();
     ClipChildren(*dc, rcPaint);
     Paint(surfaceWindow, rcPaint);
     dc->BeginDrawing();
     ClipChildren(*dc, rcPaint);
     Paint(surfaceWindow, rcPaint);

-    dc->EndDrawing();

 
     delete surfaceWindow;
     if (paintState == paintAbandoned) {
 
     delete surfaceWindow;
     if (paintState == paintAbandoned) {

-        // Painting area was insufficient to cover new styling or brace highlight positions
-        FullPaint(dc);
+        // Painting area was insufficient to cover new styling or brace
+        // highlight positions
+        FullPaint();

     }
     paintState = notPainting;
     }
     paintState = notPainting;

+    dc->EndDrawing();

 }
 
 
 }
 
 


@@ -633,9 +679,6 @@ void ScintillaWX::DoMouseWheel(int rotation, int delta,
 
 
 void ScintillaWX::DoSize(int WXUNUSED(width), int WXUNUSED(height)) {
 
 
 void ScintillaWX::DoSize(int WXUNUSED(width), int WXUNUSED(height)) {

-//      PRectangle rcClient(0,0,width,height);
-//      SetScrollBarsTo(rcClient);
-//      DropGraphics();

     ChangeSize();
 }
 
     ChangeSize();
 }
 


@@ -676,15 +719,17 @@ void ScintillaWX::DoMiddleButtonUp(Point pt) {
 
     pdoc->BeginUndoAction();
     wxTextDataObject data;
 
     pdoc->BeginUndoAction();
     wxTextDataObject data;

-    bool gotData = FALSE;
+    bool gotData = false;

     if (wxTheClipboard->Open()) {
     if (wxTheClipboard->Open()) {

-        wxTheClipboard->UsePrimarySelection(TRUE);
+        wxTheClipboard->UsePrimarySelection(true);

         gotData = wxTheClipboard->GetData(data);
         gotData = wxTheClipboard->GetData(data);

-        wxTheClipboard->UsePrimarySelection(FALSE);
+        wxTheClipboard->UsePrimarySelection(false);

         wxTheClipboard->Close();
     }
     if (gotData) {
         wxTheClipboard->Close();
     }
     if (gotData) {

-        wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText());
+        wxString   text = wxTextBuffer::Translate(data.GetText(),
+                                                  wxConvertEOLMode(pdoc->eolMode));
+        wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);

         int        len = strlen(buf);
         pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);
         int        len = strlen(buf);
         pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);


@@ -771,7 +816,7 @@ int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool WXUNU
         }
     }
 #endif
         }
     }
 #endif

-    
+

     int rv = KeyDown(key, shift, ctrl, alt, consumed);
 
     if (key)
     int rv = KeyDown(key, shift, ctrl, alt, consumed);
 
     if (key)


@@ -795,7 +840,7 @@ void ScintillaWX::DoOnListBox() {
     AutoCompleteCompleted();
 }
 
     AutoCompleteCompleted();
 }
 

- 
+

 void ScintillaWX::DoOnIdle(wxIdleEvent& evt) {
 
     if ( Idle() )
 void ScintillaWX::DoOnIdle(wxIdleEvent& evt) {
 
     if ( Idle() )


@@ -803,13 +848,16 @@ void ScintillaWX::DoOnIdle(wxIdleEvent& evt) {
     else
         SetIdle(false);
 }
     else
         SetIdle(false);
 }

- 
+

 //----------------------------------------------------------------------
 
 #if wxUSE_DRAG_AND_DROP
 bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
     SetDragPosition(invalidPosition);
 
 //----------------------------------------------------------------------
 
 #if wxUSE_DRAG_AND_DROP
 bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
     SetDragPosition(invalidPosition);
 

+    wxString text = wxTextBuffer::Translate(data,
+                                            wxConvertEOLMode(pdoc->eolMode));
+

     // Send an event to allow the drag details to be changed
     wxStyledTextEvent evt(wxEVT_STC_DO_DROP, stc->GetId());
     evt.SetEventObject(stc);
     // Send an event to allow the drag details to be changed
     wxStyledTextEvent evt(wxEVT_STC_DO_DROP, stc->GetId());
     evt.SetEventObject(stc);


@@ -817,7 +865,7 @@ bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
     evt.SetX(x);
     evt.SetY(y);
     evt.SetPosition(PositionFromLocation(Point(x,y)));
     evt.SetX(x);
     evt.SetY(y);
     evt.SetPosition(PositionFromLocation(Point(x,y)));

-    evt.SetDragText(data);
+    evt.SetDragText(text);

     stc->GetEventHandler()->ProcessEvent(evt);
 
     dragResult = evt.GetDragResult();
     stc->GetEventHandler()->ProcessEvent(evt);
 
     dragResult = evt.GetDragResult();


@@ -825,10 +873,10 @@ bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
         DropAt(evt.GetPosition(),
                wx2stc(evt.GetDragText()),
                dragResult == wxDragMove,
         DropAt(evt.GetPosition(),
                wx2stc(evt.GetDragText()),
                dragResult == wxDragMove,

-               FALSE); // TODO: rectangular?
-        return TRUE;
+               false); // TODO: rectangular?
+        return true;

     }
     }

-    return FALSE;
+    return false;

 }
 
 
 }
 
 


@@ -861,22 +909,10 @@ void ScintillaWX::DoDragLeave() {
 #endif
 //----------------------------------------------------------------------
 
 #endif
 //----------------------------------------------------------------------
 

-// Redraw all of text area. This paint will not be abandoned.
-void ScintillaWX::FullPaint(wxDC *dc) {
-    wxCHECK_RET(dc != NULL, wxT("Invalid wxDC in ScintillaWX::FillPaint"));
-    paintState = painting;
-    rcPaint = GetClientRectangle();
-    paintingAllText = true;
-    Surface* surfaceWindow = Surface::Allocate();
-    surfaceWindow->Init(dc, wMain.GetID());
-
-    dc->BeginDrawing();
-    ClipChildren(*dc, rcPaint);
-    Paint(surfaceWindow, rcPaint);
-    dc->EndDrawing();
-
-    delete surfaceWindow;
-    paintState = notPainting;
+// Force the whole window to be repainted
+void ScintillaWX::FullPaint() {
+    stc->Refresh(false);
+    stc->Update();

 }
 
 
 }
 
 


@@ -897,7 +933,11 @@ void ScintillaWX::ClipChildren(wxDC& dc, PRectangle rect) {
         rgn.Subtract(childRect);
     }
     if (ct.inCallTipMode) {
         rgn.Subtract(childRect);
     }
     if (ct.inCallTipMode) {

-        wxRect childRect = ((wxWindow*)ct.wCallTip.GetID())->GetRect();
+        wxSTCCallTip* tip = (wxSTCCallTip*)ct.wCallTip.GetID();
+        wxRect childRect = tip->GetRect();
+#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
+        childRect.SetPosition(tip->GetMyPosition());
+#endif

         rgn.Subtract(childRect);
     }
 
         rgn.Subtract(childRect);
     }
 


@@ -917,6 +957,6 @@ void ScintillaWX::SetUseAntiAliasing(bool useAA) {
 bool ScintillaWX::GetUseAntiAliasing() {
     return vs.extraFontFlag;
 }
 bool ScintillaWX::GetUseAntiAliasing() {
     return vs.extraFontFlag;
 }

- 
+

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