declare all NameStr[] strings as const char using the correct WXDLLIMPEXP_DATA_ macros; in the process, change wxPropGrid window classes to take 'const wxString& name' arguments instead of 'const wxChar *name'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -30,7 +30,7 @@
|
||||
#include "wx/crt.h"
|
||||
#endif
|
||||
|
||||
const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
|
||||
const char wxDataViewCtrlNameStr[] = "dataviewCtrl";
|
||||
|
||||
|
||||
bool operator == (const wxDataViewItem &left, const wxDataViewItem &right)
|
||||
@@ -721,7 +721,7 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la
|
||||
void wxDataViewRendererBase::CancelEditing()
|
||||
{
|
||||
if (!m_editorCtrl) return;
|
||||
|
||||
|
||||
GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
|
||||
|
||||
m_editorCtrl->Hide();
|
||||
@@ -1220,7 +1220,7 @@ wxDataViewCtrlBase::PrependColumn( wxDataViewColumn *col )
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
bool
|
||||
wxDataViewCtrlBase::InsertColumn( unsigned int WXUNUSED(pos), wxDataViewColumn *col )
|
||||
{
|
||||
col->SetOwner( (wxDataViewCtrl*) this );
|
||||
|
||||
Reference in New Issue
Block a user