Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Changed style of public member.

  • Loading branch information...
commit 145d63bba54fed7b8307861faa783036885ccd51 1 parent 1f8fbe8
@adamv adamv authored
View
4 src/EditorCtrl.cpp
@@ -4263,7 +4263,7 @@ void EditorCtrl::InsertColumn(const wxArrayString& text, bool select) {
void EditorCtrl::OnPaste() {
if (!wxTheClipboard->Open()) return;
- if (wxTheClipboard->IsSupported( MultilineDataObject::s_formatId )) {
+ if (wxTheClipboard->IsSupported( MultilineDataObject::FormatId )) {
MultilineDataObject data;
if (wxTheClipboard->GetData(data)) {
// Get the text from clipboard
@@ -8987,7 +8987,7 @@ wxDragResult EditorCtrl::DragDropTarget::OnData(wxCoord WXUNUSED(x), wxCoord WXU
else if (df == wxDF_FILENAME) {
m_parent.OnDragDrop(m_fileObject->GetFilenames());
}
- else if (df == wxDataFormat(MultilineDataObject::s_formatId)) {
+ else if (df == wxDataFormat(MultilineDataObject::FormatId)) {
wxArrayString text;
m_columnObject->GetText(text);
m_parent.OnDragDropColumn(text, def);
View
5 src/MultilineDataObject.cpp
@@ -13,10 +13,10 @@
#include "MultilineDataObject.h"
-const wxChar* MultilineDataObject::s_formatId = wxT("eMultiLineText");
+const wxChar* MultilineDataObject::FormatId = wxT("eMultiLineText");
MultilineDataObject::MultilineDataObject() {
- SetFormat(s_formatId);
+ SetFormat(FormatId);
}
void MultilineDataObject::AddText(const wxString& text) {
@@ -53,4 +53,3 @@ bool MultilineDataObject::SetData(size_t len, const void *buf) {
m_nullSeparatedText = wxString((const wxChar*)buf, charlen);
return true;
}
-
View
2  src/MultilineDataObject.h
@@ -31,7 +31,7 @@ class MultilineDataObject : public wxDataObjectSimple {
virtual bool GetDataHere(void *buf) const;
virtual bool SetData(size_t len, const void *buf);
- static const wxChar* s_formatId;
+ static const wxChar* FormatId;
private:
wxString m_nullSeparatedText;
Please sign in to comment.
Something went wrong with that request. Please try again.