projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
deprecated Initialize/CleanUpClasses
[wxWidgets.git]
/
src
/
x11
/
toplevel.cpp
diff --git
a/src/x11/toplevel.cpp
b/src/x11/toplevel.cpp
index fdcf28a869b83167d53d98f2f4c9f24e19ec35ef..cc51c2100111ca1080d9201995f780b617df371b 100644
(file)
--- a/
src/x11/toplevel.cpp
+++ b/
src/x11/toplevel.cpp
@@
-248,7
+248,7
@@
wxTopLevelWindowX11::~wxTopLevelWindowX11()
wxTopLevelWindows.DeleteObject(this);
// If this is the last top-level window, exit.
wxTopLevelWindows.DeleteObject(this);
// If this is the last top-level window, exit.
- if ( wxTheApp && (wxTopLevelWindows.
Number
() == 0) )
+ if ( wxTheApp && (wxTopLevelWindows.
GetCount
() == 0) )
{
wxTheApp->SetTopWindow(NULL);
{
wxTheApp->SetTopWindow(NULL);
@@
-404,6
+404,13
@@
void wxTopLevelWindowX11::SetIcons(const wxIconBundle& icons )
wxSetIconsX11( wxGlobalDisplay(), GetMainWindow(), icons );
}
wxSetIconsX11( wxGlobalDisplay(), GetMainWindow(), icons );
}
+bool wxTopLevelWindowX11::SetShape(const wxRegion& region)
+{
+ return wxDoSetShape( wxGlobalDisplay(),
+ (Window)GetMainWindow(),
+ region );
+}
+
void wxTopLevelWindowX11::SetTitle(const wxString& title)
{
m_title = title;
void wxTopLevelWindowX11::SetTitle(const wxString& title)
{
m_title = title;
@@
-677,7
+684,7
@@
bool wxSetWMDecorations(Window w, long style)
wmProp.flags |= GR_WM_FLAGS_PROPS ;
}
wmProp.flags |= GR_WM_FLAGS_PROPS ;
}
- if (style & wx
SYSTEM_MENU
)
+ if (style & wx
CLOSE_BOX
)
{
wmProp.props |= GR_WM_PROPS_CLOSEBOX ;
wmProp.flags |= GR_WM_FLAGS_PROPS ;
{
wmProp.props |= GR_WM_PROPS_CLOSEBOX ;
wmProp.flags |= GR_WM_FLAGS_PROPS ;
@@
-751,10
+758,10
@@
bool wxSetWMDecorations(Window w, long style)
hints.decorations |= MWM_DECOR_TITLE;
if ((style & wxSYSTEM_MENU) != 0)
hints.decorations |= MWM_DECOR_TITLE;
if ((style & wxSYSTEM_MENU) != 0)
- {
- hints.functions |= MWM_FUNC_CLOSE;
hints.decorations |= MWM_DECOR_MENU;
hints.decorations |= MWM_DECOR_MENU;
- }
+
+ if ((style & wxCLOSE_BOX) != 0)
+ hints.functions |= MWM_FUNC_CLOSE;
if ((style & wxMINIMIZE_BOX) != 0)
{
if ((style & wxMINIMIZE_BOX) != 0)
{