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

Added SetSize to toplevel window

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-02-14 11:55:22 +00:00
parent af2309c0fb
commit edaf57a4da
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/x11/toplevel.cpp
View File

@@ -125,9 +125,21 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
XSetTransientForHint( xdisplay, xwindow, xparent ); XSetTransientForHint( xdisplay, xwindow, xparent );
wxSize size2(size);
if (size2.x == -1)
size2.x = 100;
if (size2.y == -1)
size2.y = 100;
wxPoint pos2(pos);
if (pos2.x == -1)
pos2.x = 100;
if (pos2.y == -1)
pos2.y = 100;
size_hints.flags = PSize; size_hints.flags = PSize;
size_hints.width = size.x; size_hints.width = size2.x;
size_hints.height = size.y; size_hints.height = size2.y;
XSetWMNormalHints( xdisplay, xwindow, &size_hints); XSetWMNormalHints( xdisplay, xwindow, &size_hints);
wm_hints.flags = InputHint | StateHint /* | WindowGroupHint */; wm_hints.flags = InputHint | StateHint /* | WindowGroupHint */;
@@ -141,6 +153,7 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
wxSetWMDecorations((Window) GetMainWindow(), style); wxSetWMDecorations((Window) GetMainWindow(), style);
SetTitle(title); SetTitle(title);
SetSize(pos2.x, pos2.y, size2.x, size2.y);
return TRUE; return TRUE;
} }
@@ -336,12 +349,14 @@ bool wxSetWMDecorations(Window w, long style)
if (style & wxRESIZE_BORDER) if (style & wxRESIZE_BORDER)
{ {
wxLogDebug("MWM_DECOR_RESIZEH");
hints.flags |= MWM_HINTS_DECORATIONS; hints.flags |= MWM_HINTS_DECORATIONS;
hints.decorations |= MWM_DECOR_RESIZEH; hints.decorations |= MWM_DECOR_RESIZEH;
} }
if (style & wxSYSTEM_MENU) if (style & wxSYSTEM_MENU)
{ {
wxLogDebug("MWM_DECOR_MENU");
hints.flags |= MWM_HINTS_DECORATIONS; hints.flags |= MWM_HINTS_DECORATIONS;
hints.decorations |= MWM_DECOR_MENU; hints.decorations |= MWM_DECOR_MENU;
} }
@@ -350,30 +365,28 @@ bool wxSetWMDecorations(Window w, long style)
(style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_HORIZ) ||
(style & wxTINY_CAPTION_VERT)) (style & wxTINY_CAPTION_VERT))
{ {
wxLogDebug("MWM_DECOR_TITLE");
hints.flags |= MWM_HINTS_DECORATIONS; hints.flags |= MWM_HINTS_DECORATIONS;
hints.decorations |= MWM_DECOR_TITLE; hints.decorations |= MWM_DECOR_TITLE;
} }
if (style & wxTHICK_FRAME) if (style & wxTHICK_FRAME)
{ {
hints.flags |= MWM_HINTS_DECORATIONS; wxLogDebug("MWM_DECOR_BORDER");
hints.decorations |= MWM_DECOR_BORDER;
}
if (style & wxTHICK_FRAME)
{
hints.flags |= MWM_HINTS_DECORATIONS; hints.flags |= MWM_HINTS_DECORATIONS;
hints.decorations |= MWM_DECOR_BORDER; hints.decorations |= MWM_DECOR_BORDER;
} }
if (style & wxMINIMIZE_BOX) if (style & wxMINIMIZE_BOX)
{ {
wxLogDebug("MWM_DECOR_MINIMIZE");
hints.flags |= MWM_HINTS_DECORATIONS; hints.flags |= MWM_HINTS_DECORATIONS;
hints.decorations |= MWM_DECOR_MINIMIZE; hints.decorations |= MWM_DECOR_MINIMIZE;
} }
if (style & wxMAXIMIZE_BOX) if (style & wxMAXIMIZE_BOX)
{ {
wxLogDebug("MWM_DECOR_MAXIMIZE");
hints.flags |= MWM_HINTS_DECORATIONS; hints.flags |= MWM_HINTS_DECORATIONS;
hints.decorations |= MWM_DECOR_MAXIMIZE; hints.decorations |= MWM_DECOR_MAXIMIZE;
} }