wxDC::SetFont can now handle invalid font and doesn't assert anymore (other ports...

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

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 10e29c82ef7b6ba79014edb59f31aa9e9a4a9636..f56024c0cacdaa9af606b309b0a3b97e5f1453ca 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -93,9 +93,11 @@ DEFINE_EVENT_TYPE( wxEVT_STC_USERLISTSELECTION )
 DEFINE_EVENT_TYPE( wxEVT_STC_URIDROPPED )
 DEFINE_EVENT_TYPE( wxEVT_STC_DWELLSTART )
 DEFINE_EVENT_TYPE( wxEVT_STC_DWELLEND )
+#if wxUSE_DRAG_AND_DROP
 DEFINE_EVENT_TYPE( wxEVT_STC_START_DRAG )
 DEFINE_EVENT_TYPE( wxEVT_STC_DRAG_OVER )
 DEFINE_EVENT_TYPE( wxEVT_STC_DO_DROP )
+#endif
 
 
 BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
@@ -1852,7 +1854,7 @@ void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
     // alt let's skip it.
     bool ctrl = evt.ControlDown();
     bool alt  = evt.AltDown();
-    bool skip = (ctrl || alt && ! (ctrl && alt));
+    bool skip = ((ctrl || alt) && ! (ctrl && alt));
 
     if (key <= 0xff && !iscntrl(key) && !m_lastKeyDownConsumed && !skip) {
         m_swx->DoAddChar(key);
@@ -2052,8 +2054,10 @@ wxStyledTextEvent::wxStyledTextEvent(wxEventType commandType, int id)
     m_listType = 0;
     m_x = 0;
     m_y = 0;
+#if wxUSE_DRAG_AND_DROP
     m_dragAllowMove = FALSE;
     m_dragResult = wxDragNone;
+#endif
 }
 
 bool wxStyledTextEvent::GetShift() const { return (m_modifiers & SCI_SHIFT) != 0; }
@@ -2085,9 +2089,11 @@ void wxStyledTextEvent::CopyObject(wxObject& obj) const {
     o->m_x =            m_x;
     o->m_y =            m_y;
 
+#if wxUSE_DRAG_AND_DROP
     o->m_dragText =     m_dragText;
     o->m_dragAllowMove =m_dragAllowMove;
     o->m_dragResult =   m_dragResult;
+#endif
 }
 
 //----------------------------------------------------------------------