Get/SetTitle only for wxTopLevelWindow (wxGTK part).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: mdi.cpp
|
// Name: src/gtk/mdi.cpp
|
||||||
// Purpose:
|
// Purpose:
|
||||||
// Author: Robert Roebling
|
// Author: Robert Roebling
|
||||||
// Id: $Id$
|
// Id: $Id$
|
||||||
@@ -457,7 +457,7 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
|
|||||||
|
|
||||||
static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* child )
|
static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* child )
|
||||||
{
|
{
|
||||||
wxString s = child->m_title;
|
wxString s = child->GetTitle();
|
||||||
if (s.IsNull()) s = _("MDI child");
|
if (s.IsNull()) s = _("MDI child");
|
||||||
|
|
||||||
GtkWidget *label_widget = gtk_label_new( s.mbc_str() );
|
GtkWidget *label_widget = gtk_label_new( s.mbc_str() );
|
||||||
@@ -503,7 +503,7 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
|
|||||||
m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
|
m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
|
||||||
|
|
||||||
if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
|
if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
|
||||||
!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") ))
|
!CreateBase( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") ))
|
||||||
{
|
{
|
||||||
wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") );
|
wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") );
|
||||||
return false;
|
return false;
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: mdi.cpp
|
// Name: src/gtk/mdi.cpp
|
||||||
// Purpose:
|
// Purpose:
|
||||||
// Author: Robert Roebling
|
// Author: Robert Roebling
|
||||||
// Id: $Id$
|
// Id: $Id$
|
||||||
@@ -457,7 +457,7 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
|
|||||||
|
|
||||||
static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* child )
|
static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* child )
|
||||||
{
|
{
|
||||||
wxString s = child->m_title;
|
wxString s = child->GetTitle();
|
||||||
if (s.IsNull()) s = _("MDI child");
|
if (s.IsNull()) s = _("MDI child");
|
||||||
|
|
||||||
GtkWidget *label_widget = gtk_label_new( s.mbc_str() );
|
GtkWidget *label_widget = gtk_label_new( s.mbc_str() );
|
||||||
@@ -503,7 +503,7 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
|
|||||||
m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
|
m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
|
||||||
|
|
||||||
if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
|
if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
|
||||||
!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") ))
|
!CreateBase( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") ))
|
||||||
{
|
{
|
||||||
wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") );
|
wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") );
|
||||||
return false;
|
return false;
|
||||||
|
Reference in New Issue
Block a user