/////////////////////////////////////////////////////////////////////////////
-// Name: windows.cpp
+// Name: src/motif/window.cpp
// Purpose: wxWindow
// Author: Julian Smart
// Modified by:
#define XtScreen XTSCREEN
#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"
+#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/evtloop.h"
-#include "wx/hash.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"
m_winCaptured = false;
m_isShown = true;
-
+
m_hScrollBar =
m_vScrollBar =
m_borderWidget =
{
if (g_captureWindow == this)
g_captureWindow = NULL;
-
+
m_isBeingDeleted = true;
// Motif-specific actions first
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, label.c_str(), NULL);
}
-wxString wxWindow::GetTitle() const
+wxString wxWindow::GetLabel() const
{
- char *title;
- XtVaGetValues((Widget)GetMainWidget(), XmNtitle, &title, NULL);
+ char *label;
+ XtVaGetValues((Widget)GetMainWidget(), XmNtitle, &label, NULL);
- return wxString(title);
+ return wxString(label);
}
void wxWindow::DoCaptureMouse()
// wxASSERT_MSG( m_cursor.Ok(),
// wxT("cursor must be valid after call to the base version"));
- wxCursor* cursor2 = NULL;
+ const wxCursor* cursor2 = NULL;
if (m_cursor.Ok())
cursor2 = & m_cursor;
else
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;
}
// 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
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);
+ 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;
{
// A bit of optimization to help sort out the flickers.
int oldX = -1, oldY = -1, oldW = -1, oldH = -1;
+
if( !fromCtor )
{
GetSize(& oldW, & oldH);
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;
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);
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);
}
|| (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;
#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;
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;
GetSize(& width1, & height1);
if (keepOriginalSize && (width != width1 || height != height1))
{
- SetSize(-1, -1, width, height);
+ SetSize(wxDefaultCoord, wxDefaultCoord, width, height);
}
}
}
// Find the wxWindow at the current mouse position, returning the mouse
// position.
-wxWindow* wxFindWindowAtPointer(const wxPoint& pt)
+wxWindow* wxFindWindowAtPointer(wxPoint& pt)
{
- return wxFindWindowAtPoint(wxGetMousePosition());
+ pt = wxGetMousePosition();
+ 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;
}
// ----------------------------------------------------------------------------
int wxNoOptimize::ms_count = 0;
-
projects / wxWidgets.git / blobdiff