Merged 44802 (NOTE: CVS) from trunk:
implement Set/GetTitle() (last part of patch 1679337) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@47998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -149,7 +149,7 @@ bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
|
|||||||
[m_cocoaNSWindow setExcludedFromWindowsMenu: YES];
|
[m_cocoaNSWindow setExcludedFromWindowsMenu: YES];
|
||||||
if(style & wxSTAY_ON_TOP)
|
if(style & wxSTAY_ON_TOP)
|
||||||
[m_cocoaNSWindow setLevel:NSFloatingWindowLevel];
|
[m_cocoaNSWindow setLevel:NSFloatingWindowLevel];
|
||||||
[m_cocoaNSWindow setTitle:wxNSStringWithWxString(title)];
|
SetTitle(title);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -341,13 +341,12 @@ void wxTopLevelWindowCocoa::OnCloseWindow(wxCloseEvent& event)
|
|||||||
|
|
||||||
void wxTopLevelWindowCocoa::SetTitle( const wxString& WXUNUSED(title))
|
void wxTopLevelWindowCocoa::SetTitle( const wxString& WXUNUSED(title))
|
||||||
{
|
{
|
||||||
// TODO
|
[m_cocoaNSWindow setTitle:wxNSStringWithWxString(title)];
|
||||||
}
|
}
|
||||||
|
|
||||||
wxString wxTopLevelWindowCocoa::GetTitle() const
|
wxString wxTopLevelWindowCocoa::GetTitle() const
|
||||||
{
|
{
|
||||||
// TODO
|
return wxStringWithNSString([m_cocoaNSWindow title]);
|
||||||
return wxEmptyString;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wxWindow* wxTopLevelWindowCocoa::SetDefaultItem(wxWindow *win)
|
wxWindow* wxTopLevelWindowCocoa::SetDefaultItem(wxWindow *win)
|
||||||
|
Reference in New Issue
Block a user