cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved EnableCloseButton() from wxialog to wxTLW

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-11-15 02:21:43 +00:00
parent 3cc2aa562f
commit a91cf80c60
4 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/msw/dialog.h
View File

@ -70,9 +70,6 @@ public:
// returns TRUE if we're in a modal loop // returns TRUE if we're in a modal loop
bool IsModalShowing() const; bool IsModalShowing() const;
// wxMSW only: remove the "Close" button from the dialog
bool EnableCloseButton(bool enable = TRUE);
// implementation only from now on // implementation only from now on
// ------------------------------- // -------------------------------

4
include/wx/msw/toplevel.h
View File

@ -62,6 +62,10 @@ public:
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
virtual bool IsFullScreen() const { return m_fsIsShowing; } virtual bool IsFullScreen() const { return m_fsIsShowing; }
// wxMSW only: EnableCloseButton(FALSE) may be used to remove the "Close"
// button from the title bar
bool EnableCloseButton(bool enable = TRUE);
// implementation from now on // implementation from now on
// -------------------------- // --------------------------

32
src/msw/dialog.cpp
View File

@ -127,38 +127,6 @@ bool wxDialog::Create(wxWindow *parent,
return TRUE; return TRUE;
} }
bool wxDialog::EnableCloseButton(bool enable)
{
#ifndef __WXMICROWIN__
// get system (a.k.a. window) menu
HMENU hmenu = ::GetSystemMenu(GetHwnd(), FALSE /* get it */);
if ( !hmenu )
{
wxLogLastError(_T("GetSystemMenu"));
return FALSE;
}
// enabling/disabling the close item from it also automatically
// disables/enabling the close title bar button
if ( !::EnableMenuItem(hmenu, SC_CLOSE,
MF_BYCOMMAND | (enable ? MF_ENABLED : MF_GRAYED)) )
{
wxLogLastError(_T("EnableMenuItem(SC_CLOSE)"));
return FALSE;
}
// update appearance immediately
if ( !::DrawMenuBar(GetHwnd()) )
{
wxLogLastError(_T("DrawMenuBar"));
}
#endif
return TRUE;
}
void wxDialog::SetModal(bool flag) void wxDialog::SetModal(bool flag)
{ {
if ( flag ) if ( flag )

33
src/msw/toplevel.cpp
View File

@ -601,3 +601,36 @@ void wxTopLevelWindowMSW::SetIcon(const wxIcon& icon)
} }
#endif // __WIN95__ #endif // __WIN95__
} }
bool wxTopLevelWindowMSW::EnableCloseButton(bool enable)
{
#ifndef __WXMICROWIN__
// get system (a.k.a. window) menu
HMENU hmenu = ::GetSystemMenu(GetHwnd(), FALSE /* get it */);
if ( !hmenu )
{
wxLogLastError(_T("GetSystemMenu"));
return FALSE;
}
// enabling/disabling the close item from it also automatically
// disables/enables the close title bar button
if ( !::EnableMenuItem(hmenu, SC_CLOSE,
MF_BYCOMMAND | (enable ? MF_ENABLED : MF_GRAYED)) )
{
wxLogLastError(_T("EnableMenuItem(SC_CLOSE)"));
return FALSE;
}
// update appearance immediately
if ( !::DrawMenuBar(GetHwnd()) )
{
wxLogLastError(_T("DrawMenuBar"));
}
#endif // !__WXMICROWIN__
return TRUE;
}