X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b5f1895643cf94b38ac19a4c1151e259310852e..bb996f289574defb0ae4339ae8e46ff3cf6fa54c:/src/motif/window.cpp?ds=sidebyside diff --git a/src/motif/window.cpp b/src/motif/window.cpp index cea79f107f..01bac12813 100644 --- a/src/motif/window.cpp +++ b/src/motif/window.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/motif/windows.cpp +// Name: src/motif/window.cpp // Purpose: wxWindow // Author: Julian Smart // Modified by: @@ -20,27 +20,25 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifdef __VMS -#define XtDisplay XTDISPLAY -#define XtWindow XTWINDOW -#define XtScreen XTSCREEN +#ifndef WX_PRECOMP + #include "wx/hash.h" + #include "wx/log.h" + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/frame.h" + #include "wx/dc.h" + #include "wx/dcclient.h" + #include "wx/button.h" + #include "wx/menu.h" + #include "wx/settings.h" + #include "wx/scrolwin.h" + #include "wx/layout.h" + #include "wx/menuitem.h" + #include "wx/module.h" #endif -#include "wx/menu.h" -#include "wx/dc.h" -#include "wx/dcclient.h" -#include "wx/utils.h" -#include "wx/app.h" -#include "wx/layout.h" -#include "wx/button.h" -#include "wx/settings.h" -#include "wx/frame.h" -#include "wx/scrolwin.h" -#include "wx/module.h" -#include "wx/menuitem.h" -#include "wx/log.h" #include "wx/evtloop.h" -#include "wx/hash.h" +#include "wx/unix/utilsx11.h" #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" @@ -62,7 +60,7 @@ // 2) call DoMoveWindow from DoSetSize, allowing controls to override it #ifdef __VMS__ -#pragma message disable nosimpint + #pragma message disable nosimpint #endif #include @@ -73,10 +71,11 @@ #include #include // for XmMenuPosition #ifdef __VMS__ -#pragma message enable nosimpint + #pragma message enable nosimpint #endif #include "wx/motif/private.h" +#include "wx/motif/dcclient.h" #include @@ -133,8 +132,6 @@ static int str16len(const char *s) // event tables // ---------------------------------------------------------------------------- - IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase) - BEGIN_EVENT_TABLE(wxWindow, wxWindowBase) EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged) END_EVENT_TABLE() @@ -227,14 +224,17 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id, long style, const wxString& name) { + // Get default border + wxBorder border = GetBorder(style); + style &= ~wxBORDER_MASK; + style |= border; + wxCHECK_MSG( parent, false, "can't create wxWindow without parent" ); CreateBase(parent, id, pos, size, style, wxDefaultValidator, name); parent->AddChild(this); - - m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); - m_foregroundColour = *wxBLACK; + PreCreation(); //// TODO: we should probably optimize by only creating a //// a drawing area if we have one or more scrollbars (wxVSCROLL/wxHSCROLL). @@ -327,21 +327,16 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id, (XtPointer) this ); - // Scrolled widget needs to have its colour changed or we get a little blue - // square where the scrollbars abutt - wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); - wxDoChangeBackgroundColour(m_scrolledWindow, backgroundColour, true); - wxDoChangeBackgroundColour(m_drawingArea, backgroundColour, true); - XmScrolledWindowSetAreas( (Widget)m_scrolledWindow, (Widget) 0, (Widget) 0, (Widget) m_drawingArea); + PostCreation(); + // Without this, the cursor may not be restored properly (e.g. in splitter // sample). SetCursor(*wxSTANDARD_CURSOR); - SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); DoSetSizeIntr(pos.x, pos.y, size.x,size.y, wxSIZE_AUTO, true); return true; } @@ -349,11 +344,11 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id, // Destructor wxWindow::~wxWindow() { + SendDestroyEvent(); + if (g_captureWindow == this) g_captureWindow = NULL; - m_isBeingDeleted = true; - // Motif-specific actions first WXWidget wMain = GetMainWidget(); if ( wMain ) @@ -561,7 +556,7 @@ wxWindow *wxWindowBase::DoFindFocus() // currently active. // (2) The widget with the focus may not be in the widget table // depending on which widgets I put in the table - wxWindow *winFocus = (wxWindow *)NULL; + wxWindow *winFocus = NULL; for ( wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() ) @@ -633,12 +628,13 @@ void wxWindow::Lower() void wxWindow::SetLabel(const wxString& label) { - XtVaSetValues((Widget)GetMainWidget(), XmNtitle, label.c_str(), NULL); + XtVaSetValues((Widget)GetMainWidget(), XmNtitle, + (const char*)label.mb_str(), NULL); } wxString wxWindow::GetLabel() const { - char *label; + char *label = NULL; XtVaGetValues((Widget)GetMainWidget(), XmNtitle, &label, NULL); return wxString(label); @@ -691,10 +687,10 @@ bool wxWindow::SetCursor(const wxCursor& cursor) return false; } - // wxASSERT_MSG( m_cursor.Ok(), + // wxASSERT_MSG( m_cursor.IsOk(), // wxT("cursor must be valid after call to the base version")); - wxCursor* cursor2 = NULL; - if (m_cursor.Ok()) + const wxCursor* cursor2 = NULL; + if (m_cursor.IsOk()) cursor2 = & m_cursor; else cursor2 = wxSTANDARD_CURSOR; @@ -878,6 +874,9 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) int y2 = (dy >= 0) ? y + dy : y; wxClientDC dc(this); + wxClientDCImpl * const + dcimpl = static_cast(dc.GetImpl()); + GC const gc = (GC) dcimpl->GetGC(); dc.SetLogicalFunction (wxCOPY); @@ -885,10 +884,9 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) Window window = XtWindow(widget); Display* display = XtDisplay(widget); - XCopyArea(display, window, window, (GC) dc.GetGC(), - x1, y1, w1, h1, x2, y2); + XCopyArea(display, window, window, gc, x1, y1, w1, h1, x2, y2); - dc.SetAutoSetting(true); + dcimpl->SetAutoSetting(true); wxBrush brush(GetBackgroundColour(), wxSOLID); dc.SetBrush(brush); // FIXME: needed? @@ -916,8 +914,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) rect->width = dx; rect->height = h; - XFillRectangle(display, window, - (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height); + XFillRectangle(display, window, gc, rect->x, rect->y, rect->width, rect->height); rect->x = rect->x; rect->y = rect->y; @@ -935,9 +932,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) rect->width = -dx; rect->height = h; - XFillRectangle(display, window, - (GC) dc.GetGC(), rect->x, rect->y, rect->width, - rect->height); + XFillRectangle(display, window, gc, rect->x, rect->y, rect->width, rect->height); rect->x = rect->x; rect->y = rect->y; @@ -955,8 +950,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) rect->width = w; rect->height = dy; - XFillRectangle(display, window, - (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height); + XFillRectangle(display, window, gc, rect->x, rect->y, rect->width, rect->height); rect->x = rect->x; rect->y = rect->y; @@ -974,8 +968,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) rect->width = w; rect->height = -dy; - XFillRectangle(display, window, - (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height); + XFillRectangle(display, window, gc, rect->x, rect->y, rect->width, rect->height); rect->x = rect->x; rect->y = rect->y; @@ -1089,7 +1082,6 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y) menu->SetId(1); /* Mark as popped-up */ menu->CreateMenu(NULL, widget, menu, 0); - menu->SetInvokingWindow(this); menu->UpdateUI(); @@ -1170,12 +1162,13 @@ void wxWindow::DoGetSize(int *x, int *y) const m_drawingArea ) ); Dimension xx, yy; - XtVaGetValues( widget, - XmNwidth, &xx, - XmNheight, &yy, - NULL ); - if(x) *x = xx; - if(y) *y = yy; + if (widget) + XtVaGetValues( widget, + XmNwidth, &xx, + XmNheight, &yy, + NULL ); + if(x) *x = widget ? xx : -1; + if(y) *y = widget ? yy : -1; } void wxWindow::DoGetPosition(int *x, int *y) const @@ -1209,9 +1202,11 @@ void wxWindow::DoScreenToClient(int *x, int *y) const Window thisWindow = XtWindow(widget); Window childWindow; - int xx = *x; - int yy = *y; - XTranslateCoordinates(display, rootWindow, thisWindow, xx, yy, x, y, &childWindow); + int xx = x ? *x : 0; + int yy = y ? *y : 0; + XTranslateCoordinates(display, rootWindow, thisWindow, + xx, yy, x ? x : &xx, y ? y : &yy, + &childWindow); } void wxWindow::DoClientToScreen(int *x, int *y) const @@ -1222,9 +1217,11 @@ void wxWindow::DoClientToScreen(int *x, int *y) const Window thisWindow = XtWindow(widget); Window childWindow; - int xx = *x; - int yy = *y; - XTranslateCoordinates(display, thisWindow, rootWindow, xx, yy, x, y, &childWindow); + int xx = x ? *x : 0; + int yy = y ? *y : 0; + XTranslateCoordinates(display, thisWindow, rootWindow, + xx, yy, x ? x : &xx, y ? y : &yy, + &childWindow); } @@ -1247,18 +1244,24 @@ void wxWindow::DoSetSizeIntr(int x, int y, int width, int height, { // A bit of optimization to help sort out the flickers. int oldX = -1, oldY = -1, oldW = -1, oldH = -1; + if( !fromCtor ) { GetSize(& oldW, & oldH); GetPosition(& oldX, & oldY); } + if (x == -1) + x = oldX; + if (x == -1) + x = oldY; + if ( !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) ) { - if ( x == -1 ) - x = oldX; - if ( y == -1 ) - y = oldY; + if ( width == -1 ) + width = oldW; + if ( height == -1 ) + height = oldH; } wxSize size(wxDefaultSize); @@ -1295,10 +1298,10 @@ void wxWindow::DoSetSizeIntr(int x, int y, int width, int height, { int flags = 0; - if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + if (x != oldX) flags |= wxMOVE_X; - if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + if (y != oldY) flags |= wxMOVE_Y; if (width > 0) @@ -1425,8 +1428,6 @@ void wxWindow::DoMoveWindowIntr(int xx, int yy, int w, int h, } else { - if( xx < 0 ) xx = 0; - if( yy < 0 ) yy = 0; if( w < 1 ) w = 1; if( h < 1 ) h = 1; @@ -1451,41 +1452,45 @@ void wxWindow::DoMoveWindow(int x, int y, int width, int height) int wxWindow::GetCharHeight() const { - wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" ); - int height; - wxGetTextExtent (GetXDisplay(), m_font, 1.0, - "x", NULL, &height, NULL, NULL); + if (m_font.IsOk()) + wxGetTextExtent (GetXDisplay(), m_font, 1.0, + "x", NULL, &height, NULL, NULL); + else + wxGetTextExtent (this, "x", NULL, &height, NULL, NULL); return height; } int wxWindow::GetCharWidth() const { - wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" ); - int width; - wxGetTextExtent (GetXDisplay(), m_font, 1.0, - "x", &width, NULL, NULL, NULL); + if (m_font.IsOk()) + wxGetTextExtent (GetXDisplay(), m_font, 1.0, + "x", &width, NULL, NULL, NULL); + else + wxGetTextExtent (this, "x", &width, NULL, NULL, NULL); return width; } -void wxWindow::GetTextExtent(const wxString& string, - int *x, int *y, - int *descent, int *externalLeading, - const wxFont *theFont) const +void wxWindow::DoGetTextExtent(const wxString& string, + int *x, int *y, + int *descent, + int *externalLeading, + const wxFont *theFont) const { const wxFont *fontToUse = theFont ? theFont : &m_font; - wxCHECK_RET( fontToUse->Ok(), "valid window font needed" ); - if (externalLeading) *externalLeading = 0; - wxGetTextExtent (GetXDisplay(), *fontToUse, 1.0, - string, x, y, NULL, descent); + if (fontToUse->IsOk()) + wxGetTextExtent (GetXDisplay(), *fontToUse, 1.0, + string, x, y, NULL, descent); + else + wxGetTextExtent (this, string, x, y, NULL, descent); } // ---------------------------------------------------------------------------- @@ -1499,9 +1504,12 @@ void wxWindow::AddUpdateRect(int x, int y, int w, int h) void wxWindow::Refresh(bool eraseBack, const wxRect *rect) { + Widget widget = (Widget) GetMainWidget(); + if (!widget) + return; m_needsRefresh = true; - Display *display = XtDisplay((Widget) GetMainWidget()); - Window thisWindow = XtWindow((Widget) GetMainWidget()); + Display *display = XtDisplay(widget); + Window thisWindow = XtWindow(widget); XExposeEvent dummyEvent; int width, height; @@ -1532,10 +1540,13 @@ void wxWindow::Refresh(bool eraseBack, const wxRect *rect) wxClientDC dc(this); wxBrush backgroundBrush(GetBackgroundColour(), wxSOLID); dc.SetBackground(backgroundBrush); + + wxClientDCImpl * const + dcimpl = static_cast(dc.GetImpl()); if (rect) - dc.Clear(*rect); + dcimpl->Clear(*rect); else - dc.Clear(); + dcimpl->Clear(); } XSendEvent(display, thisWindow, False, ExposureMask, (XEvent *)&dummyEvent); @@ -1548,7 +1559,10 @@ void wxWindow::DoPaint() { wxPaintDC dc(this); - GC tempGC = (GC) dc.GetBackingGC(); + wxPaintDCImpl * const + dcimpl = static_cast(dc.GetImpl()); + + GC tempGC = (GC) dcimpl->GetBackingGC(); Widget widget = (Widget) GetMainWidget(); @@ -1605,11 +1619,11 @@ void wxWindow::DoPaint() // Set an erase event first wxEraseEvent eraseEvent(GetId(), &dc); eraseEvent.SetEventObject(this); - GetEventHandler()->ProcessEvent(eraseEvent); + HandleWindowEvent(eraseEvent); wxPaintEvent event(GetId()); event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); + HandleWindowEvent(event); m_needsRefresh = false; } @@ -1631,21 +1645,13 @@ void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event) { wxSysColourChangedEvent event2; event.SetEventObject(win); - win->GetEventHandler()->ProcessEvent(event2); + win->HandleWindowEvent(event2); } node = node->GetNext(); } } -void wxWindow::OnInternalIdle() -{ - // This calls the UI-update mechanism (querying windows for - // menu/toolbar/control state information) - if (wxUpdateUIEvent::CanUpdate(this)) - UpdateWindowUI(wxUPDATE_UI_FROMIDLE); -} - // ---------------------------------------------------------------------------- // accelerators // ---------------------------------------------------------------------------- @@ -1653,7 +1659,7 @@ void wxWindow::OnInternalIdle() bool wxWindow::ProcessAccelerator(wxKeyEvent& event) { #if wxUSE_ACCEL - if (!m_acceleratorTable.Ok()) + if (!m_acceleratorTable.IsOk()) return false; int count = m_acceleratorTable.GetCount(); @@ -1691,7 +1697,7 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event) // If ProcessEvent returns true (it was handled), then // the calling code will skip the event handling. - return frame->GetEventHandler()->ProcessEvent(commandEvent); + return frame->HandleWindowEvent(commandEvent); } } #endif @@ -1710,7 +1716,7 @@ bool wxWindow::ProcessAccelerator(wxKeyEvent& event) { wxCommandEvent commandEvent (wxEVT_COMMAND_BUTTON_CLICKED, child->GetId()); commandEvent.SetEventObject(child); - return child->GetEventHandler()->ProcessEvent(commandEvent); + return child->HandleWindowEvent(commandEvent); } return false; @@ -1849,7 +1855,7 @@ WXDisplay *wxWindow::GetXDisplay() const if ( wMain ) return (WXDisplay*) XtDisplay(wMain); else - return (WXDisplay*) NULL; + return NULL; } WXWidget wxWindow::GetMainWidget() const @@ -1896,7 +1902,7 @@ void wxWidgetResizeProc(Widget w, XConfigureEvent *WXUNUSED(event), wxSize newSize(win->GetSize()); wxSizeEvent sizeEvent(newSize, win->GetId()); sizeEvent.SetEventObject(win); - win->GetEventHandler()->ProcessEvent(sizeEvent); + win->HandleWindowEvent(sizeEvent); } } @@ -1982,7 +1988,7 @@ static void wxCanvasInputEvent(Widget drawingArea, wxMouseEvent wxevent(0); if (wxTranslateMouseEvent(wxevent, canvas, drawingArea, xevent)) { - canvas->GetEventHandler()->ProcessEvent(wxevent); + canvas->HandleWindowEvent(wxevent); } break; } @@ -1999,7 +2005,7 @@ static void wxCanvasInputEvent(Widget drawingArea, if (parent) { event.SetEventType(wxEVT_CHAR_HOOK); - if (parent->GetEventHandler()->ProcessEvent(event)) + if (parent->HandleWindowEvent(event)) return; } @@ -2008,10 +2014,10 @@ static void wxCanvasInputEvent(Widget drawingArea, event.SetEventType(wxEVT_KEY_DOWN); // Only process OnChar if OnKeyDown didn't swallow it - if (!canvas->GetEventHandler()->ProcessEvent (event)) + if (!canvas->HandleWindowEvent (event)) { event.SetEventType(wxEVT_CHAR); - canvas->GetEventHandler()->ProcessEvent (event); + canvas->HandleWindowEvent (event); } } break; @@ -2021,7 +2027,7 @@ static void wxCanvasInputEvent(Widget drawingArea, wxKeyEvent event (wxEVT_KEY_UP); if (wxTranslateKeyEvent (event, canvas, (Widget) 0, xevent)) { - canvas->GetEventHandler()->ProcessEvent (event); + canvas->HandleWindowEvent (event); } break; } @@ -2031,7 +2037,7 @@ static void wxCanvasInputEvent(Widget drawingArea, { wxFocusEvent event(wxEVT_SET_FOCUS, canvas->GetId()); event.SetEventObject(canvas); - canvas->GetEventHandler()->ProcessEvent(event); + canvas->HandleWindowEvent(event); } break; } @@ -2041,7 +2047,7 @@ static void wxCanvasInputEvent(Widget drawingArea, { wxFocusEvent event(wxEVT_KILL_FOCUS, canvas->GetId()); event.SetEventObject(canvas); - canvas->GetEventHandler()->ProcessEvent(event); + canvas->HandleWindowEvent(event); } break; } @@ -2063,7 +2069,7 @@ static void wxPanelItemEventHandler(Widget wid, wxMouseEvent wxevent(0); if (wxTranslateMouseEvent(wxevent, window, wid, event)) { - window->GetEventHandler()->ProcessEvent(wxevent); + window->HandleWindowEvent(wxevent); } } @@ -2082,6 +2088,8 @@ static void wxScrollBarCallback(Widget scrollbar, XmScrollBarCallbackStruct *cbs) { wxWindow *win = wxGetWindowFromTable(scrollbar); + wxCHECK_RET( win, wxT("invalid widget in scrollbar callback") ); + wxOrientation orientation = (wxOrientation)wxPtrToUInt(clientData); wxEventType eventType = wxEVT_NULL; @@ -2139,7 +2147,7 @@ static void wxScrollBarCallback(Widget scrollbar, cbs->value, orientation); event.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent(event); + win->HandleWindowEvent(event); } // For repainting arbitrary windows @@ -2377,7 +2385,7 @@ bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, #define YAllocColor XAllocColor XColor g_itemColors[5]; -int wxComputeColours (Display *display, wxColour * back, wxColour * fore) +int wxComputeColours (Display *display, const wxColour * back, const wxColour * fore) { int result; static XmColorProc colorProc; @@ -2481,12 +2489,12 @@ void wxWindow::ChangeFont(bool keepOriginalSize) // to its original size! We therefore have to set the size // back again. TODO: a better way in Motif? Widget w = (Widget) GetLabelWidget(); // Usually the main widget - if (w && m_font.Ok()) + if (w && m_font.IsOk()) { int width, height, width1, height1; GetSize(& width, & height); - wxDoChangeFont( GetLabelWidget(), m_font ); + wxDoChangeFont( w, m_font ); GetSize(& width1, & height1); if (keepOriginalSize && (width != width1 || height != height1)) @@ -2496,6 +2504,20 @@ void wxWindow::ChangeFont(bool keepOriginalSize) } } +// Post-creation +void wxWindow::PostCreation() +{ + ChangeFont(); + ChangeForegroundColour(); + ChangeBackgroundColour(); +} + +// Pre-creation +void wxWindow::PreCreation() +{ + InheritAttributes(); +} + // ---------------------------------------------------------------------------- // global functions // ---------------------------------------------------------------------------- @@ -2522,23 +2544,151 @@ wxWindow* wxFindWindowAtPointer(wxPoint& pt) return wxFindWindowAtPoint(pt); } -// Get the current mouse position. -wxPoint wxGetMousePosition() +void wxGetMouseState(int& rootX, int& rootY, unsigned& maskReturn) { Display *display = wxGlobalDisplay(); Window rootWindow = RootWindowOfScreen (DefaultScreenOfDisplay(display)); Window rootReturn, childReturn; - int rootX, rootY, winX, winY; - unsigned int maskReturn; + int winX, winY; XQueryPointer (display, rootWindow, &rootReturn, &childReturn, &rootX, &rootY, &winX, &winY, &maskReturn); - return wxPoint(rootX, rootY); } +// Get the current mouse position. +wxPoint wxGetMousePosition() +{ + int x, y; + unsigned mask; + + wxGetMouseState(x, y, mask); + return wxPoint(x, y); +} + +wxMouseState wxGetMouseState() +{ + wxMouseState ms; + int x, y; + unsigned mask; + + wxGetMouseState(x, y, mask); + + ms.SetX(x); + ms.SetY(y); + + ms.SetLeftDown(mask & Button1Mask); + ms.SetMiddleDown(mask & Button2Mask); + ms.SetRightDown(mask & Button3Mask); + + ms.SetControlDown(mask & ControlMask); + ms.SetShiftDown(mask & ShiftMask); + ms.SetAltDown(mask & Mod3Mask); + ms.SetMetaDown(mask & Mod1Mask); + + return ms; +} + + +#if wxMOTIF_NEW_FONT_HANDLING + +#include + +void wxGetTextExtent(const wxWindow* window, const wxString& str, + int* width, int* height, int* ascent, int* descent) +{ + Arg args[2]; + int count = 0; + XmRendition rendition = NULL; + XmRenderTable table = NULL; + Widget w = (Widget) window->GetLabelWidget(); + + XtVaGetValues( w, XmNrenderTable, &table, NULL ); + if (table == NULL) + table = XmeGetDefaultRenderTable(w, XmTEXT_RENDER_TABLE); + + rendition = XmRenderTableGetRendition( table, "" ); + XtSetArg( args[count], XmNfont, 0 ); ++count; + XtSetArg( args[count], XmNfontType, 0 ); ++count; + XmRenditionRetrieve( rendition, args, count ); + + if (args[1].value == XmFONT_IS_FONTSET) + { + XRectangle ink, logical; + WXFontSet fset = (WXFontSet) args[0].value; + + XmbTextExtents( (XFontSet)fset, str.c_str(), str.length(), + &ink, &logical); + + if( width ) *width = logical.width; + if( height ) *height = logical.height; + if( ascent ) *ascent = -logical.y; + if( descent ) *descent = logical.height + logical.y; + } + else + { + int direction, ascent2, descent2; + XCharStruct overall; + XFontStruct* fontStruct; + + XmeRenderTableGetDefaultFont( table, &fontStruct ); + XTextExtents(fontStruct, (const char*)str.c_str(), str.length(), + &direction, &ascent2, &descent2, &overall); + + if ( width ) *width = overall.width; + if ( height ) *height = ascent2 + descent2; + if ( descent ) *descent = descent2; + if ( ascent ) *ascent = ascent2; + } +} + +#else // if !wxMOTIF_NEW_FONT_HANDLING + +void wxGetTextExtent(const wxWindow* window, const wxString& str, + int* width, int* height, int* ascent, int* descent) +{ + XmFontList list = NULL; + XmFontContext cxt; + XmFontType type; + Widget w = (Widget) window->GetLabelWidget(); + + XtVaGetValues( w, XmNfontList, &list, NULL ); + XmFontListInitFontContext( &cxt, list ); + + XmFontListEntry entry = XmFontListNextEntry( cxt ); + XmFontListFreeFontContext( cxt ); + XtPointer thing = XmFontListEntryGetFont( entry, &type ); + + if (type == XmFONT_IS_FONTSET) + { + XRectangle ink, logical; + + XmbTextExtents( (XFontSet)thing, str.c_str(), str.length(), + &ink, &logical); + + if( width ) *width = logical.width; + if( height ) *height = logical.height; + if( ascent ) *ascent = -logical.y; + if( descent ) *descent = logical.height + logical.y; + } + else + { + int direction, ascent2, descent2; + XCharStruct overall; + + XTextExtents( (XFontStruct*)thing, (char*)(const char*)str.c_str(), str.length(), + &direction, &ascent2, &descent2, &overall); + + if ( width ) *width = overall.width; + if ( height ) *height = ascent2 + descent2; + if ( descent ) *descent = descent2; + if ( ascent ) *ascent = ascent2; + } +} + +#endif // !wxMOTIF_NEW_FONT_HANDLING // ---------------------------------------------------------------------------- // wxNoOptimize: switch off size optimization