temporary fix the linking problem due to making GSocket::Detected_Read/Write() non...

[wxWidgets.git] / include / wx / stc / stc.h

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 985e10df14a5b0dddacf66f473a649d7a7ffbb0b..e701ed988105e3ba762bd21ee300b4db015ffffd 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -1978,7 +1978,7 @@ class  WordList;
 struct SCNotification;
 
 #ifndef SWIG
-extern WXDLLIMPEXP_STC const wxChar* wxSTCNameStr;
+extern WXDLLIMPEXP_DATA_STC(const char) wxSTCNameStr[];
 class  WXDLLIMPEXP_FWD_STC wxStyledTextCtrl;
 class  WXDLLIMPEXP_FWD_STC wxStyledTextEvent;
 #endif
@@ -2643,7 +2643,7 @@ public:
     void SetReadOnly(bool readOnly);
 
     // Will a paste succeed?
-    bool CanPaste();
+    bool CanPaste() const;
 
     // Are there any undoable actions in the undo history?
     bool CanUndo() const;
@@ -3703,7 +3703,7 @@ public:
         if ( to )
             *to = GetSelectionEnd();
     }
-    
+
     // kept for compatibility only
     void GetSelection(int *from, int *to)
     {
@@ -3715,7 +3715,7 @@ public:
             *to = t;
     }
 #endif
-    
+
     virtual bool IsEditable() const { return !GetReadOnly(); }
     virtual void SetEditable(bool editable) { SetReadOnly(!editable); }