/////////////////////////////////////////////////////////////////////////////
-// Name: windows.cpp
+// Name: src/motif/windows.cpp
// Purpose: wxWindow
// Author: Julian Smart
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "window.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include <string.h>
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-static const int SCROLL_MARGIN = 4;
-
// ----------------------------------------------------------------------------
// global variables for this module
// ----------------------------------------------------------------------------
m_winCaptured = false;
m_isShown = true;
-
+
m_hScrollBar =
m_vScrollBar =
m_borderWidget =
//// drawing area, since otherwise the translations are different.
// New translations for getting mouse motion feedback
- static const String translations =
+ static const String translations = wxMOTIF_STR(
"<Btn1Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
<Btn2Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
<Btn3Motion>: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
<Motion>: wxCanvasMotionEvent() DrawingAreaInput()\n\
<EnterWindow>: wxCanvasMotionEvent() DrawingAreaInput()\n\
<LeaveWindow>: wxCanvasMotionEvent() DrawingAreaInput()\n\
-<Key>: DrawingAreaInput()";
+<Key>: DrawingAreaInput()");
XtActionsRec actions[1];
- actions[0].string = "wxCanvasMotionEvent";
+ actions[0].string = wxMOTIF_STR("wxCanvasMotionEvent");
actions[0].proc = (XtActionProc) wxCanvasMotionEvent;
XtAppAddActions ((XtAppContext) wxTheApp->GetAppContext(), actions, 1);
{
if (g_captureWindow == this)
g_captureWindow = NULL;
-
+
m_isBeingDeleted = true;
// Motif-specific actions first
int wxWindow::GetScrollRange(int orient) const
{
Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
- // CE scintilla windows don't always have these scrollbars
+ // CE scintilla windows don't always have these scrollbars
// and it tends to pile up a whole bunch of asserts
//wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
int range = 0;
- if (scrollBar)
+ if (scrollBar)
XtVaGetValues(scrollBar, XmNmaximum, &range, NULL);
return range;
}
}
menu->SetId(1); /* Mark as popped-up */
- menu->CreateMenu(NULL, widget, menu);
+ menu->CreateMenu(NULL, widget, menu, 0);
menu->SetInvokingWindow(this);
menu->UpdateUI();
XmNwidth, &xx,
XmNheight, &yy,
NULL );
- if(x) *x = xx;
+ if(x) *x = xx;
if(y) *y = yy;
}
{
Widget widget = (Widget)
( m_drawingArea ?
- ( m_borderWidget ? m_borderWidget : m_scrolledWindow ) :
+ ( m_borderWidget ? m_borderWidget : m_scrolledWindow ) :
GetTopWidget() );
Position xx, yy;
if (GetParent())
{
wxPoint pt(GetParent()->GetClientAreaOrigin());
- xx -= pt.x;
- yy -= pt.y;
+ xx = (Position)(xx - pt.x);
+ yy = (Position)(yy - pt.y);
}
if(x) *x = xx;
wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
int height;
-
+
wxGetTextExtent (GetXDisplay(), m_font, 1.0,
"x", NULL, &height, NULL, NULL);
wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
int width;
-
+
wxGetTextExtent (GetXDisplay(), m_font, 1.0,
"x", &width, NULL, NULL, NULL);
bool wxAddWindowToTable(Widget w, wxWindow *win)
{
- wxWindow *oldItem = NULL;
- if ((oldItem = (wxWindow *)wxWidgetHashTable->Get ((long) w)))
+ const long key = (long)w;
+ if ( wxWidgetHashTable->Get(key))
{
wxLogDebug("Widget table clash: new widget is %ld, %s",
- (long)w, win->GetClassInfo()->GetClassName());
+ key, win->GetClassInfo()->GetClassName());
return false;
}
- wxWidgetHashTable->Put((long) w, win);
+ wxWidgetHashTable->Put(key, win);
wxLogTrace("widget", "Widget 0x%p <-> window %p (%s)",
- (WXWidget)w, win, win->GetClassInfo()->GetClassName());
+ w, win, win->GetClassInfo()->GetClassName());
return true;
}
XtFree ((char *) ptr);
}
- SetInitialBestSize(wxSize(width, height));
-
- if (x != -1 || y != -1)
- {
- if (x == -1)
- x = 0;
- if (y == -1)
- y = 0;
- Move(x, y);
- }
+ if (x == -1)
+ x = 0;
+ if (y == -1)
+ y = 0;
+ DoSetSize (x, y, width, height, wxSIZE_USE_EXISTING);
return true;
}
if (win->PreResize())
{
- int width, height;
- win->GetSize(&width, &height);
- wxSizeEvent sizeEvent(wxSize(width, height), win->GetId());
+ wxSize newSize(win->GetSize());
+ wxSizeEvent sizeEvent(newSize, win->GetId());
sizeEvent.SetEventObject(win);
win->GetEventHandler()->ProcessEvent(sizeEvent);
}
XmScrollBarCallbackStruct *cbs)
{
wxWindow *win = wxGetWindowFromTable(scrollbar);
- wxOrientation orientation = (wxOrientation)(int)clientData;
+ wxOrientation orientation = (wxOrientation)wxPtrToUInt(clientData);
wxEventType eventType = wxEVT_NULL;
switch (cbs->reason)
// For repainting arbitrary windows
void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event, char *)
{
- Window window;
- Display *display;
-
wxWindow* win = wxGetWindowFromTable(w);
if (!win)
return;
- switch(event -> type)
+ switch ( event->type )
{
- case Expose:
+ case Expose:
{
- window = (Window) win -> GetXWindow();
- display = (Display *) win -> GetXDisplay();
-
win->AddUpdateRect(event->xexpose.x, event->xexpose.y,
event->xexpose.width, event->xexpose.height);
- if (event -> xexpose.count == 0)
+ if ( event->xexpose.count == 0 )
{
win->DoPaint();
}
|| (event_right_is_down (xevent)
&& (eventType != wxEVT_RIGHT_UP)));
- wxevent.m_shiftDown = xevent->xbutton.state & ShiftMask;
- wxevent.m_controlDown = xevent->xbutton.state & ControlMask;
- wxevent.m_altDown = xevent->xbutton.state & Mod3Mask;
- wxevent.m_metaDown = xevent->xbutton.state & Mod1Mask;
+ wxevent.m_shiftDown = (xevent->xbutton.state & ShiftMask) == ShiftMask;
+ wxevent.m_controlDown = (xevent->xbutton.state & ControlMask) == ControlMask;
+ wxevent.m_altDown = (xevent->xbutton.state & Mod3Mask) == Mod3Mask;
+ wxevent.m_metaDown = (xevent->xbutton.state & Mod1Mask) == Mod1Mask;
wxevent.SetId(win->GetId());
wxevent.SetEventObject(win);
if (id > -1)
return true;
- else
- return false;
- break;
+
+ return false;
}
default:
break;
if (back)
{
- g_itemColors[0].red = (((long) back->Red ()) << 8);
- g_itemColors[0].green = (((long) back->Green ()) << 8);
- g_itemColors[0].blue = (((long) back->Blue ()) << 8);
+ g_itemColors[0].red = (unsigned short)(((long) back->Red ()) << 8);
+ g_itemColors[0].green = (unsigned short)(((long) back->Green ()) << 8);
+ g_itemColors[0].blue = (unsigned short)(((long) back->Blue ()) << 8);
g_itemColors[0].flags = DoRed | DoGreen | DoBlue;
if (colorProc == (XmColorProc) NULL)
{
}
if (fore)
{
- g_itemColors[wxFORE_INDEX].red = (((long) fore->Red ()) << 8);
- g_itemColors[wxFORE_INDEX].green = (((long) fore->Green ()) << 8);
- g_itemColors[wxFORE_INDEX].blue = (((long) fore->Blue ()) << 8);
+ g_itemColors[wxFORE_INDEX].red = (unsigned short)(((long) fore->Red ()) << 8);
+ g_itemColors[wxFORE_INDEX].green = (unsigned short)(((long) fore->Green ()) << 8);
+ g_itemColors[wxFORE_INDEX].blue = (unsigned short)(((long) fore->Blue ()) << 8);
g_itemColors[wxFORE_INDEX].flags = DoRed | DoGreen | DoBlue;
if (result == wxNO_COLORS)
result = wxFORE_COLORS;
WXWidget mainWidget = GetMainWidget();
if ( mainWidget )
wxDoChangeBackgroundColour(mainWidget, m_backgroundColour);
+ if ( m_scrolledWindow && mainWidget != m_scrolledWindow )
+ wxDoChangeForegroundColour(m_scrolledWindow, m_backgroundColour);
}
void wxWindow::ChangeForegroundColour()
// position.
wxWindow* wxFindWindowAtPointer(wxPoint& pt)
{
- return wxFindWindowAtPoint(wxGetMousePosition());
+ pt = wxGetMousePosition();
+ return wxFindWindowAtPoint(pt);
}
// Get the current mouse position.
projects / wxWidgets.git / blobdiff