Add EnableCloseButton() as wxMSW does. Use it in
wxProgressDialog so that without wxPD_CAN_ABORT you cannot close the dialog. Closes [ 1585563 ] wxProgressDialog @ GTK CloseButton git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -51,6 +51,8 @@ public:
|
|||||||
virtual void SetIcons(const wxIconBundle& icons);
|
virtual void SetIcons(const wxIconBundle& icons);
|
||||||
virtual void Restore();
|
virtual void Restore();
|
||||||
|
|
||||||
|
virtual bool EnableCloseButton(bool enable = true);
|
||||||
|
|
||||||
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; };
|
||||||
|
|
||||||
|
@@ -694,7 +694,18 @@ wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
|
|||||||
g_lastActiveFrame = NULL;
|
g_lastActiveFrame = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxTopLevelWindowGTK::EnableCloseButton( bool enable )
|
||||||
|
{
|
||||||
|
if (enable)
|
||||||
|
m_gdkFunc |= GDK_FUNC_CLOSE;
|
||||||
|
else
|
||||||
|
m_gdkFunc &= ~GDK_FUNC_CLOSE;
|
||||||
|
|
||||||
|
if (GTK_WIDGET_REALIZED(m_widget) && (m_widget->window))
|
||||||
|
gdk_window_set_functions( m_widget->window, (GdkWMFunction)m_gdkFunc );
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
|
bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user