X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e014a0c44e36efe429bea1303f4309af287eb77..8aaef28406647d6aa706c34f57dd151f00b18e5b:/src/gtk/mdi.cpp?ds=sidebyside diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp index ab91caff85..3437436706 100644 --- a/src/gtk/mdi.cpp +++ b/src/gtk/mdi.cpp @@ -49,7 +49,7 @@ extern wxList wxPendingDelete; static void gtk_mdi_page_change_callback(GtkNotebook *WXUNUSED(widget), GtkNotebookPage *WXUNUSED(page), - gint page, + gint WXUNUSED(page), wxMDIParentFrame *parent ) { if (g_isIdle) @@ -312,14 +312,14 @@ void wxMDIChildFrame::GetClientSize( int *width, int *height ) const wxWindow::GetClientSize( width, height ); } -void wxMDIChildFrame::AddChild( wxWindow *child ) +void wxMDIChildFrame::AddChild( wxWindowBase *child ) { - wxWindow::AddChild( child ); + wxWindow::AddChild(child); } void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) { - wxASSERT_MSG( m_menuBar == NULL, _T("Only one menubar allowed") ); + wxASSERT_MSG( m_menuBar == NULL, wxT("Only one menubar allowed") ); m_menuBar = menu_bar; @@ -431,9 +431,9 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style ) m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI; if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) || - !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, _T("wxMDIClientWindow") )) + !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") )) { - wxFAIL_MSG( _T("wxMDIClientWindow creation failed") ); + wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") ); return FALSE; }