m_backgroundColour.CalcPixel( (WXColormap) cm );
m_hasBgCol = TRUE;
+ 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;
+
#if !wxUSE_NANOX
XSetWindowAttributes xattributes;
XSizeHints size_hints;
xattributes.override_redirect = False;
#endif
- 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;
-
#if wxUSE_NANOX
long backColor, foreColor;
backColor = GR_RGB(m_backgroundColour.Red(), m_backgroundColour.Green(), m_backgroundColour.Blue());
#endif
XSelectInput( xdisplay, xwindow,
- extraFlags | ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
- ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
- KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
- PropertyChangeMask );
-
+ extraFlags |
+ ExposureMask |
+ KeyPressMask |
+ KeyReleaseMask |
+ ButtonPressMask |
+ ButtonReleaseMask |
+ ButtonMotionMask |
+ EnterWindowMask |
+ LeaveWindowMask |
+ PointerMotionMask |
+ KeymapStateMask |
+ FocusChangeMask |
+ ColormapChangeMask |
+ StructureNotifyMask |
+ PropertyChangeMask
+ );
+
wxAddWindowToTable( xwindow, (wxWindow*) this );
// Set background to None which will prevent X11 from clearing the
bool wxTopLevelWindowX11::Show(bool show)
{
+ // Nano-X has to force a size event,
+ // else there's no initial size.
+#if wxUSE_NANOX
+ if (show)
+ {
+ wxSizeEvent event(GetSize(), GetId());
+ event.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(event);
+ }
+#endif
+
return wxWindowX11::Show(show);
}
GR_WM_PROPERTIES wmProp;
wmProp.flags = 0;
+ wmProp.props = 0;
if (style & wxRESIZE_BORDER)
{
{
wmProp.props |= GR_WM_PROPS_CAPTION ;
wmProp.flags |= GR_WM_FLAGS_PROPS ;
+
+ // The default dialog style doesn't include any kind
+ // of border, which is a bit odd. Anyway, inclusion
+ // of a caption surely implies a border.
+ style |= wxTHICK_FRAME;
}
if (style & wxTHICK_FRAME)
if (style & wxRESIZE_BORDER)
{
- wxLogDebug("MWM_DECOR_RESIZEH");
+ // wxLogDebug("MWM_DECOR_RESIZEH");
hints.flags |= MWM_HINTS_DECORATIONS;
hints.decorations |= MWM_DECOR_RESIZEH;
}
if (style & wxSYSTEM_MENU)
{
- wxLogDebug("MWM_DECOR_MENU");
+ // wxLogDebug("MWM_DECOR_MENU");
hints.flags |= MWM_HINTS_DECORATIONS;
hints.decorations |= MWM_DECOR_MENU;
}
(style & wxTINY_CAPTION_HORIZ) ||
(style & wxTINY_CAPTION_VERT))
{
- wxLogDebug("MWM_DECOR_TITLE");
+ // wxLogDebug("MWM_DECOR_TITLE");
hints.flags |= MWM_HINTS_DECORATIONS;
hints.decorations |= MWM_DECOR_TITLE;
}
if ((style & wxTHICK_FRAME) || (style & wxSIMPLE_BORDER) || (style & wxCAPTION))
{
- wxLogDebug("MWM_DECOR_BORDER");
+ // wxLogDebug("MWM_DECOR_BORDER");
hints.flags |= MWM_HINTS_DECORATIONS;
hints.decorations |= MWM_DECOR_BORDER;
}
if (style & wxMINIMIZE_BOX)
{
- wxLogDebug("MWM_DECOR_MINIMIZE");
+ // wxLogDebug("MWM_DECOR_MINIMIZE");
hints.flags |= MWM_HINTS_DECORATIONS;
hints.decorations |= MWM_DECOR_MINIMIZE;
}
if (style & wxMAXIMIZE_BOX)
{
- wxLogDebug("MWM_DECOR_MAXIMIZE");
+ // wxLogDebug("MWM_DECOR_MAXIMIZE");
hints.flags |= MWM_HINTS_DECORATIONS;
hints.decorations |= MWM_DECOR_MAXIMIZE;
}
// smaller
wxPoint wxTopLevelWindowX11::GetClientAreaOrigin() const
{
- // In fact wxFrame::GetClientAreaOrigin
+ // wxFrame::GetClientAreaOrigin
// does the required calculation already.
-#if 0
- if (this->IsKindOf(CLASSINFO(wxFrame)))
- {
- wxFrame* frame = (wxFrame*) this;
- if (frame->GetMenuBar())
- return wxPoint(0, frame->GetMenuBar()->GetSize().y);
- }
-#endif
return wxPoint(0, 0);
}
void wxTopLevelWindowX11::DoGetClientSize( int *width, int *height ) const
{
+ XSync(wxGlobalDisplay(), False);
wxWindowX11::DoGetClientSize(width, height);
- // Done by wxTopLevelWindow
-#if 0
- if (this->IsKindOf(CLASSINFO(wxFrame)))
- {
- wxFrame* frame = (wxFrame*) this;
- if (frame->GetMenuBar())
- (*height) -= frame->GetMenuBar()->GetSize().y;
- if (frame->GetStatusBar())
- (*height) -= frame->GetStatusBar()->GetSize().y;
- }
-#endif
}
void wxTopLevelWindowX11::DoSetClientSize(int width, int height)
{
wxWindowX11::DoSetClientSize(width, height);
+ // Set the top-level window size
+ XSizeHints size_hints;
+ wxSize oldSize = GetSize();
+ wxSize oldClientSize = GetClientSize();
+
+ size_hints.flags = PSize;
+ size_hints.width = width + (oldSize.x - oldClientSize.x);
+ size_hints.height = height + (oldSize.y - oldClientSize.y);
+ XSetWMNormalHints( (Display*) GetXDisplay(), (Window) GetMainWindow(),
+ &size_hints);
+
+ // This seems to be necessary or resizes don't get performed
+ XSync(wxGlobalDisplay(), False);
+ XSync(wxGlobalDisplay(), False);
+
+#if 0
+ wxLogDebug("DoSetClientSize: Tried to set size to %d, %d", (int) size_hints.width, (int) size_hints.height);
+
+ XSync(wxGlobalDisplay(), False);
+ wxSize newSize = GetSize();
+ wxLogDebug("New size is %d, %d", (int) newSize.x, (int) newSize.y);
+#endif
+
#if 0
if (!GetMainWindow())
return;
void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
- wxString msg;
- msg.Printf("Setting pos: %d, %d", x, y);
- wxLogDebug(msg);
+ // wxLogDebug( "Setting pos: %d, %d", x, y );
wxWindowX11::DoSetSize(x, y, width, height, sizeFlags);
- wxPoint pt = GetPosition();
- msg.Printf("After, pos: %d, %d", pt.x, pt.y);
- wxLogDebug(msg);
+ XSizeHints size_hints;
+ size_hints.flags = 0;
+ if (x > -1 && y > -1)
+ size_hints.flags |= PPosition;
+ if (width > -1 && height > -1)
+ size_hints.flags |= PSize;
+ size_hints.width = width;
+ size_hints.height = height;
+ size_hints.x = x;
+ size_hints.y = y;
+ XSetWMNormalHints( (Display*) GetXDisplay(), (Window) GetMainWindow(),
+ &size_hints);
+
+ // This seems to be necessary or resizes don't get performed.
+ // Take them out (or even just one of them), and the About
+ // box of the minimal sample probably won't be resized right.
+ XSync(wxGlobalDisplay(), False);
+ XSync(wxGlobalDisplay(), False);
+
+#if 0
+ wxLogDebug("DoSetSize: Tried to set size to %d, %d", (int) size_hints.width, (int) size_hints.height);
+
+ XSync(wxGlobalDisplay(), False);
+ wxSize newSize = GetSize();
+ wxLogDebug("New size is %d, %d", (int) newSize.x, (int) newSize.y);
+#endif
+
#if 0
+ wxPoint pt = GetPosition();
+ // wxLogDebug( "After, pos: %d, %d", pt.x, pt.y );
+
XSync(wxGlobalDisplay(), False);
int w, h;
GetSize(& w, & h);
if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
{
- int yy = 0;
+ int yy = 0;
AdjustForParentClientOrigin( x, yy, sizeFlags);
windowChanges.x = x;
valueMask |= CWX;
}
if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
{
- int xx = 0;
+ int xx = 0;
AdjustForParentClientOrigin( xx, y, sizeFlags);
windowChanges.y = y;
valueMask |= CWY;
Window window = (Window) m_mainWidget;
if (window)
{
- int offsetX = 0;
- int offsetY = 0;
+ int offsetX = 0;
+ int offsetY = 0;
#if !wxUSE_NANOX
- wxLogDebug("Translating...");
+ // wxLogDebug("Translating...");
Window childWindow;
XTranslateCoordinates(wxGlobalDisplay(), window, XDefaultRootWindow(wxGlobalDisplay()),
0, 0, & offsetX, & offsetY, & childWindow);
- wxString msg;
- msg.Printf("Offset: %d, %d", offsetX, offsetY);
- wxLogDebug(msg);
+ // wxLogDebug("Offset: %d, %d", offsetX, offsetY);
#endif
XWindowAttributes attr;
projects / wxWidgets.git / blobdiff