From 15d5a9470be940a5bac66181a9e4c27d47d56558 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 14 Mar 2002 11:43:38 +0000 Subject: [PATCH] Compiles for Nano-X again git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/unix/fontutil.cpp | 2 +- src/x11/reparent.cpp | 4 ++ src/x11/toplevel.cpp | 132 +++++++++--------------------------------- 3 files changed, 33 insertions(+), 105 deletions(-) diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp index 7379c3aab2..c4879e8930 100644 --- a/src/unix/fontutil.cpp +++ b/src/unix/fontutil.cpp @@ -650,7 +650,7 @@ static wxNativeFont wxLoadQueryFont(int pointSize, // In fact pointSize is 10 * the normal point size so // divide by 10. - int pixelHeight = (int) ( (((float)pointSize) / 720.0) * 2.541 * (float) yPixelsPerCM * fudgeFactor) ; + int pixelHeight = (int) ( (((float)pointSize) / 720.0) * 2.541 * (float) yPixelsPerCM) ; // An alternative: assume that the screen is 72 dpi. //int pixelHeight = (int) (((float)pointSize / 720.0) * 72.0) ; diff --git a/src/x11/reparent.cpp b/src/x11/reparent.cpp index 2a57d3d339..7a64824265 100644 --- a/src/x11/reparent.cpp +++ b/src/x11/reparent.cpp @@ -22,6 +22,9 @@ #endif #include "wx/x11/reparent.h" + +#if !wxUSE_NANOX + #include "wx/evtloop.h" #include "wx/log.h" #include "wx/app.h" @@ -327,3 +330,4 @@ WXWindow wxReparenter::FindAClientWindow(WXWindow window, const wxString& name) } return (WXWindow) result; } +#endif diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp index 68f9b1b4c7..2feea7ac0a 100644 --- a/src/x11/toplevel.cpp +++ b/src/x11/toplevel.cpp @@ -586,6 +586,7 @@ void wxTopLevelWindowX11::DoSetClientSize(int width, int height) { wxWindowX11::DoSetClientSize(width, height); +#if !wxUSE_NANOX // Set the top-level window size XSizeHints size_hints; wxSize oldSize = GetSize(); @@ -608,26 +609,6 @@ void wxTopLevelWindowX11::DoSetClientSize(int width, int height) wxSize newSize = GetSize(); wxLogDebug("New size is %d, %d", (int) newSize.x, (int) newSize.y); #endif - -#if 0 - if (!GetMainWindow()) - return; - - XWindowChanges windowChanges; - int valueMask = 0; - - if (width != -1) - { - windowChanges.width = width ; - valueMask |= CWWidth; - } - if (height != -1) - { - windowChanges.height = height ; - valueMask |= CWHeight; - } - XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(), - valueMask, & windowChanges); #endif } @@ -650,7 +631,12 @@ void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int siz // search for the parent that is child of ROOT, because the WM may // reparent twice and notify only the next parent (like FVWM) while (next_parent != root) { - Window *theChildren; unsigned int n; + Window *theChildren; +#if wxUSE_NANOX + GR_COUNT n; +#else + unsigned int n; +#endif parent_window = next_parent; XQueryTree(display, parent_window, &root, &next_parent, &theChildren, &n); @@ -685,7 +671,8 @@ void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int siz } XConfigureWindow( display, parent_window, valueMask, &windowChanges ); - + +#if !wxUSE_NANOX XSizeHints size_hints; size_hints.flags = 0; if (x > -1 && y > -1) @@ -704,62 +691,6 @@ void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int siz // 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); - wxString msg; - msg.Printf("Before setting size: %d, %d", w, h); - wxLogDebug(msg); - if (!GetMainWindow()) - return; - - XWindowChanges windowChanges; - int valueMask = 0; - - if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - { - int yy = 0; - AdjustForParentClientOrigin( x, yy, sizeFlags); - windowChanges.x = x; - valueMask |= CWX; - } - if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - { - int xx = 0; - AdjustForParentClientOrigin( xx, y, sizeFlags); - windowChanges.y = y; - valueMask |= CWY; - } - if (width != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - { - windowChanges.width = width /* - m_borderSize*2 */; - valueMask |= CWWidth; - } - if (height != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - { - windowChanges.height = height /* -m_borderSize*2*/; - valueMask |= CWHeight; - } - - XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(), - valueMask, & windowChanges); - XSync(wxGlobalDisplay(), False); - GetSize(& w, & h); - msg.Printf("Tried to set to %d, %d. After setting size: %d, %d", width, height, w, h); - wxLogDebug(msg); #endif } @@ -778,42 +709,35 @@ void wxTopLevelWindowX11::DoGetPosition(int *x, int *y) const // search for the parent that is child of ROOT, because the WM may // reparent twice and notify only the next parent (like FVWM) while (next_parent != root) { - Window *theChildren; unsigned int n; + Window *theChildren; +#if wxUSE_NANOX + GR_COUNT n; +#else + unsigned int n; +#endif parent_window = next_parent; XQueryTree(display, parent_window, &root, &next_parent, &theChildren, &n); XFree(theChildren); // not needed } +#if 0 int xx, yy; unsigned int dummy; XGetGeometry(display, parent_window, &root, - &xx, &yy, &dummy, &dummy, &dummy, &dummy); + &xx, &yy, &dummy, &dummy, &dummy, &dummy); if (x) *x = xx; if (y) *y = yy; - -#if 0 - if (window) +#else + XWindowAttributes attr; + Status status = XGetWindowAttributes((Display*) GetXDisplay(), parent_window, & attr); + if (status) { - int offsetX = 0; - int offsetY = 0; - -#if !wxUSE_NANOX - // wxLogDebug("Translating..."); - Window childWindow; - XTranslateCoordinates(wxGlobalDisplay(), window, XDefaultRootWindow(wxGlobalDisplay()), - 0, 0, & offsetX, & offsetY, & childWindow); - - // wxLogDebug("Offset: %d, %d", offsetX, offsetY); -#endif - - XWindowAttributes attr; - Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr); - wxASSERT(status); - - if (status) - { - *x = attr.x + offsetX; - *y = attr.y + offsetY; - } + if (x) *x = attr.x; + if (y) *y = attr.y; + } + else + { + if (x) *x = 0; + if (y) *y = 0; } #endif } -- 2.45.2