/////////////////////////////////////////////////////////////////////////////
-// Name: src/motif/windows.cpp
+// Name: src/motif/window.cpp
// Purpose: wxWindow
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
-// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// 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/setup.h"
-#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"
// 2) call DoMoveWindow from DoSetSize, allowing controls to override it
#ifdef __VMS__
-#pragma message disable nosimpint
+ #pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#include <Xm/Label.h>
#include <Xm/RowColumn.h> // for XmMenuPosition
#ifdef __VMS__
-#pragma message enable nosimpint
+ #pragma message enable nosimpint
#endif
#include "wx/motif/private.h"
+#include "wx/motif/dcclient.h"
#include <string.h>
// event tables
// ----------------------------------------------------------------------------
- IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
-
BEGIN_EVENT_TABLE(wxWindow, wxWindowBase)
EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
END_EVENT_TABLE()
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).
(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;
}
// Destructor
wxWindow::~wxWindow()
{
+ SendDestroyEvent();
+
if (g_captureWindow == this)
g_captureWindow = NULL;
- m_isBeingDeleted = true;
-
// Motif-specific actions first
WXWidget wMain = GetMainWidget();
if ( wMain )
// 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() )
XLowerWindow(XtDisplay(wTop), window);
}
-void wxWindow::SetTitle(const wxString& title)
+void wxWindow::SetLabel(const wxString& label)
{
- XtVaSetValues((Widget)GetMainWidget(), XmNtitle, title.c_str(), NULL);
+ XtVaSetValues((Widget)GetMainWidget(), XmNtitle,
+ (const char*)label.mb_str(), NULL);
}
-wxString wxWindow::GetTitle() const
+wxString wxWindow::GetLabel() const
{
- char *title;
- XtVaGetValues((Widget)GetMainWidget(), XmNtitle, &title, NULL);
+ char *label = NULL;
+ XtVaGetValues((Widget)GetMainWidget(), XmNtitle, &label, NULL);
- return wxString(title);
+ return wxString(label);
}
void wxWindow::DoCaptureMouse()
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;
// Adjusting scrollbars can resize the canvas accidentally
if (newW != oldW || newH != oldH)
- SetSize(-1, -1, oldW, oldH);
+ SetSize(wxDefaultCoord, wxDefaultCoord, oldW, oldH);
}
// Does a physical scroll
int y2 = (dy >= 0) ? y + dy : y;
wxClientDC dc(this);
+ wxClientDCImpl * const
+ dcimpl = static_cast<wxClientDCImpl *>(dc.GetImpl());
+ GC const gc = (GC) dcimpl->GetGC();
dc.SetLogicalFunction (wxCOPY);
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?
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;
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;
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;
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;
bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
{
- if ( x == -1 && y == -1 )
+ if ( x == wxDefaultCoord && y == wxDefaultCoord )
{
wxPoint mouse = ScreenToClient(wxGetMousePosition());
x = mouse.x; y = mouse.y;
menu->SetId(1); /* Mark as popped-up */
menu->CreateMenu(NULL, widget, menu, 0);
- menu->SetInvokingWindow(this);
menu->UpdateUI();
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
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
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);
}
{
// 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(-1, -1);
+ wxSize size(wxDefaultSize);
if ( width <= 0 )
{
if ( ( sizeFlags & wxSIZE_AUTO_WIDTH ) && !fromCtor )
{
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)
}
else
{
- if( xx < 0 ) xx = 0;
- if( yy < 0 ) yy = 0;
if( w < 1 ) w = 1;
if( h < 1 ) h = 1;
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);
}
// ----------------------------------------------------------------------------
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;
wxClientDC dc(this);
wxBrush backgroundBrush(GetBackgroundColour(), wxSOLID);
dc.SetBackground(backgroundBrush);
+
+ wxClientDCImpl * const
+ dcimpl = static_cast<wxClientDCImpl *>(dc.GetImpl());
if (rect)
- dc.Clear(*rect);
+ dcimpl->Clear(*rect);
else
- dc.Clear();
+ dcimpl->Clear();
}
XSendEvent(display, thisWindow, False, ExposureMask, (XEvent *)&dummyEvent);
{
wxPaintDC dc(this);
- GC tempGC = (GC) dc.GetBackingGC();
+ wxPaintDCImpl * const
+ dcimpl = static_cast<wxPaintDCImpl *>(dc.GetImpl());
+
+ GC tempGC = (GC) dcimpl->GetBackingGC();
Widget widget = (Widget) GetMainWidget();
// 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;
}
{
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
// ----------------------------------------------------------------------------
bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
{
#if wxUSE_ACCEL
- if (!m_acceleratorTable.Ok())
+ if (!m_acceleratorTable.IsOk())
return false;
int count = m_acceleratorTable.GetCount();
wxMenuItem* item = frame->GetMenuBar()->FindItem(entry->GetCommand());
if (item)
{
- wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, entry->GetCommand());
+ wxCommandEvent commandEvent(wxEVT_MENU, entry->GetCommand());
commandEvent.SetEventObject(frame);
// 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
// For now, only buttons.
if ( wxDynamicCast(child, wxButton) )
{
- wxCommandEvent commandEvent (wxEVT_COMMAND_BUTTON_CLICKED, child->GetId());
+ wxCommandEvent commandEvent (wxEVT_BUTTON, child->GetId());
commandEvent.SetEventObject(child);
- return child->GetEventHandler()->ProcessEvent(commandEvent);
+ return child->HandleWindowEvent(commandEvent);
}
return false;
if ( wMain )
return (WXDisplay*) XtDisplay(wMain);
else
- return (WXDisplay*) NULL;
+ return NULL;
}
WXWidget wxWindow::GetMainWidget() const
wxSize newSize(win->GetSize());
wxSizeEvent sizeEvent(newSize, win->GetId());
sizeEvent.SetEventObject(win);
- win->GetEventHandler()->ProcessEvent(sizeEvent);
+ win->HandleWindowEvent(sizeEvent);
}
}
wxMouseEvent wxevent(0);
if (wxTranslateMouseEvent(wxevent, canvas, drawingArea, xevent))
{
- canvas->GetEventHandler()->ProcessEvent(wxevent);
+ canvas->HandleWindowEvent(wxevent);
}
break;
}
if (parent)
{
event.SetEventType(wxEVT_CHAR_HOOK);
- if (parent->GetEventHandler()->ProcessEvent(event))
+ if (parent->HandleWindowEvent(event))
return;
}
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;
wxKeyEvent event (wxEVT_KEY_UP);
if (wxTranslateKeyEvent (event, canvas, (Widget) 0, xevent))
{
- canvas->GetEventHandler()->ProcessEvent (event);
+ canvas->HandleWindowEvent (event);
}
break;
}
{
wxFocusEvent event(wxEVT_SET_FOCUS, canvas->GetId());
event.SetEventObject(canvas);
- canvas->GetEventHandler()->ProcessEvent(event);
+ canvas->HandleWindowEvent(event);
}
break;
}
{
wxFocusEvent event(wxEVT_KILL_FOCUS, canvas->GetId());
event.SetEventObject(canvas);
- canvas->GetEventHandler()->ProcessEvent(event);
+ canvas->HandleWindowEvent(event);
}
break;
}
wxMouseEvent wxevent(0);
if (wxTranslateMouseEvent(wxevent, window, wid, event))
{
- window->GetEventHandler()->ProcessEvent(wxevent);
+ window->HandleWindowEvent(wxevent);
}
}
XmScrollBarCallbackStruct *cbs)
{
wxWindow *win = wxGetWindowFromTable(scrollbar);
+ wxCHECK_RET( win, wxT("invalid widget in scrollbar callback") );
+
wxOrientation orientation = (wxOrientation)wxPtrToUInt(clientData);
wxEventType eventType = wxEVT_NULL;
cbs->value,
orientation);
event.SetEventObject( win );
- win->GetEventHandler()->ProcessEvent(event);
+ win->HandleWindowEvent(event);
}
// For repainting arbitrary windows
#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;
// 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))
{
- SetSize(-1, -1, width, height);
+ SetSize(wxDefaultCoord, wxDefaultCoord, width, height);
}
}
}
+// Post-creation
+void wxWindow::PostCreation()
+{
+ ChangeFont();
+ ChangeForegroundColour();
+ ChangeBackgroundColour();
+}
+
+// Pre-creation
+void wxWindow::PreCreation()
+{
+ InheritAttributes();
+}
+
// ----------------------------------------------------------------------------
// global functions
// ----------------------------------------------------------------------------
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 <Xm/XmP.h>
+
+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
// ----------------------------------------------------------------------------
int wxNoOptimize::ms_count = 0;
-
projects / wxWidgets.git / blobdiff