/////////////////////////////////////////////////////////////////////////////
-// Name: frame.cpp
+// Name: motif/frame.cpp
// Purpose: wxFrame
// Author: Julian Smart
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
#ifdef __GNUG__
-#pragma implementation "frame.h"
+ #pragma implementation "frame.h"
#endif
-#include "wx/frame.h"
+
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#define XtWindow XTWINDOW
+#define XtScreen XTSCREEN
+#endif
+
+# include "wx/frame.h"
#include "wx/statusbr.h"
#include "wx/toolbar.h"
#include "wx/menuitem.h"
#include "wx/settings.h"
#include "wx/app.h"
#include "wx/utils.h"
+#include "wx/log.h"
+
+#ifdef __VMS__
+ #pragma message disable nosimpint
+#endif
#if defined(__ultrix) || defined(__sgi)
-#include <Xm/Frame.h>
+ #include <Xm/Frame.h>
#endif
#include <Xm/Xm.h>
#include <X11/Shell.h>
+#include <X11/Core.h>
#if XmVersion >= 1002
-#include <Xm/XmAll.h>
+ #include <Xm/XmAll.h>
#else
-#include <Xm/Frame.h>
+ #include <Xm/Frame.h>
#endif
#include <Xm/MwmUtil.h>
#include <Xm/BulletinB.h>
#include <Xm/LabelG.h>
#include <Xm/Frame.h>
#if XmVersion > 1000
-#include <Xm/Protocols.h>
+ #include <Xm/Protocols.h>
#endif
-#include "wx/motif/private.h"
-
-extern wxHashTable *wxWidgetHashTable;
+#ifdef __VMS__
+ #pragma message enable nosimpint
+#endif
-void wxCloseFrameCallback(Widget, XtPointer, XmAnyCallbackStruct *cbs);
-void wxFrameFocusProc(Widget workArea, XtPointer clientData,
- XmAnyCallbackStruct *cbs);
+#include "wx/motif/private.h"
+#include "wx/unix/utilsx11.h"
+
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+static void wxFrameEventHandler(Widget wid,
+ XtPointer WXUNUSED(client_data),
+ XEvent* event,
+ Boolean* continueToDispatch);
+static void wxCloseFrameCallback(Widget, XtPointer, XmAnyCallbackStruct *cbs);
+static void wxFrameFocusProc(Widget workArea, XtPointer clientData,
+ XmAnyCallbackStruct *cbs);
static void wxFrameMapProc(Widget frameShell, XtPointer clientData,
XCrossingEvent * event);
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+
extern wxList wxModelessWindows;
extern wxList wxPendingDelete;
// top frame
static bool wxTopLevelUsed = FALSE;
-#if !USE_SHARED_LIBRARY
-BEGIN_EVENT_TABLE(wxFrame, wxWindow)
-EVT_SIZE(wxFrame::OnSize)
-EVT_ACTIVATE(wxFrame::OnActivate)
-EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
-EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
-EVT_IDLE(wxFrame::OnIdle)
-EVT_CLOSE(wxFrame::OnCloseWindow)
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
+ EVT_ACTIVATE(wxFrame::OnActivate)
+ EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
-#endif
-#if wxUSE_NATIVE_STATUSBAR
-bool wxFrame::m_useNativeStatusBar = TRUE;
-#else
-bool wxFrame::m_useNativeStatusBar = FALSE;
-#endif
+// ============================================================================
+// implementation
+// ============================================================================
-wxFrame::wxFrame()
-{
-#if wxUSE_TOOLBAR
- m_frameToolBar = NULL ;
-#endif // wxUSE_TOOLBAR
+// ----------------------------------------------------------------------------
+// frame construction
+// ----------------------------------------------------------------------------
- m_frameMenuBar = NULL;
- m_frameStatusBar = NULL;
-
- m_parent = NULL;
+void wxFrame::Init()
+{
m_iconized = FALSE;
//// Motif-specific
m_workArea = (WXWidget) NULL;;
m_clientArea = (WXWidget) NULL;;
m_visibleStatus = TRUE;
- m_title = "";
}
bool wxFrame::Create(wxWindow *parent,
long style,
const wxString& name)
{
- if (!parent)
+ if ( parent )
+ parent->AddChild(this);
+ else
wxTopLevelWindows.Append(this);
+ wxModelessWindows.Append(this);
+
SetName(name);
m_windowStyle = style;
- m_frameMenuBar = NULL;
-#if wxUSE_TOOLBAR
- m_frameToolBar = NULL ;
-#endif // wxUSE_TOOLBAR
- m_frameStatusBar = NULL;
-
- //// Motif-specific
- m_frameShell = (WXWidget) NULL;
- m_frameWidget = (WXWidget) NULL;;
- m_workArea = (WXWidget) NULL;;
- m_clientArea = (WXWidget) NULL;;
- m_visibleStatus = TRUE;
- m_title = "";
- m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
+ m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
m_foregroundColour = *wxBLACK;
- m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+ m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
if ( id > -1 )
m_windowId = id;
else
m_windowId = (int)NewControlId();
- if (parent) parent->AddChild(this);
+ int x = pos.x, y = pos.y;
+ int width = size.x, height = size.y;
- wxModelessWindows.Append(this);
+ // Set reasonable values for position and size if defaults have been
+ // requested
+ //
+ // MB TODO: something better than these arbitrary values ?
+ // VZ should use X resources for this...
+ if ( width == -1 )
+ width = 400;
+ if ( height == -1 )
+ height = 400;
- int x = pos.x; int y = pos.y;
- int width = size.x; int height = size.y;
+ int displayW, displayH;
+ wxDisplaySize( &displayW, &displayH );
+
+ if ( x == -1 )
+ {
+ x = (displayW - width) / 2;
+ if (x < 10) x = 10;
+ }
+ if ( y == -1 )
+ {
+ y = (displayH - height) / 2;
+ if (y < 10) y = 10;
+ }
+ // VZ: what does this do??
if (wxTopLevelUsed)
+ {
// Change suggested by Matthew Flatt
- m_frameShell = (WXWidget) XtAppCreateShell(name, wxTheApp->GetClassName(), topLevelShellWidgetClass, (Display*) wxGetDisplay(), NULL, 0);
+ m_frameShell = (WXWidget)XtAppCreateShell
+ (
+ name,
+ wxTheApp->GetClassName(),
+ topLevelShellWidgetClass,
+ (Display*) wxGetDisplay(),
+ NULL,
+ 0
+ );
+ }
else
{
m_frameShell = wxTheApp->GetTopLevelWidget();
XmNiconic, (style & wxICONIZE) ? TRUE : FALSE,
NULL);
- if (!title.IsNull())
+ if (!title.IsEmpty())
XtVaSetValues((Widget) m_frameShell,
- XmNtitle, (const char*) title,
+ XmNtitle, title.c_str(),
NULL);
m_frameWidget = (WXWidget) XtVaCreateManagedWidget("main_window",
// XmNresizePolicy, XmRESIZE_ANY,
NULL);
+ wxLogTrace(wxTRACE_Messages,
+ "Created frame (0x%08x) with work area 0x%08x and client "
+ "area 0x%08x", m_frameWidget, m_workArea, m_clientArea);
+
XtAddEventHandler((Widget) m_clientArea, ExposureMask,FALSE,
wxUniversalRepaintProc, (XtPointer) this);
+ XtAddEventHandler((Widget) m_clientArea,
+ ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask,
+ FALSE,
+ wxFrameEventHandler,
+ (XtPointer)this);
+
XtVaSetValues((Widget) m_frameWidget,
XmNworkWindow, (Widget) m_workArea,
NULL);
XtManageChild((Widget) m_clientArea);
XtManageChild((Widget) m_workArea);
- wxASSERT_MSG( !wxGetWindowFromTable((Widget)m_workArea),
- "Widget table clash in frame.cpp") ;
-
wxAddWindowToTable((Widget) m_workArea, this);
+ wxAddWindowToTable((Widget) m_clientArea, this);
- XtTranslations ptr ;
+ XtTranslations ptr;
XtOverrideTranslations((Widget) m_workArea,
ptr = XtParseTranslationTable("<Configure>: resize()"));
// This patch comes from Torsten Liermann lier@lier1.muc.de
if (XmIsMotifWMRunning( (Widget) m_frameShell ))
{
- int decor = 0 ;
+ int decor = 0;
if (style & wxRESIZE_BORDER)
- decor |= MWM_DECOR_RESIZEH ;
+ decor |= MWM_DECOR_RESIZEH;
if (style & wxSYSTEM_MENU)
decor |= MWM_DECOR_MENU;
if ((style & wxCAPTION) ||
decor |= MWM_DECOR_TITLE;
if (style & wxTHICK_FRAME)
decor |= MWM_DECOR_BORDER;
- if (style & wxTHICK_FRAME)
- decor |= MWM_DECOR_BORDER;
if (style & wxMINIMIZE_BOX)
decor |= MWM_DECOR_MINIMIZE;
if (style & wxMAXIMIZE_BOX)
decor |= MWM_DECOR_MAXIMIZE;
- XtVaSetValues((Widget) m_frameShell,XmNmwmDecorations,decor,NULL) ;
+ XtVaSetValues((Widget) m_frameShell,XmNmwmDecorations,decor,NULL);
}
// This allows non-Motif window managers to support at least the
// no-decorations case.
wxFrame::~wxFrame()
{
+ m_isBeingDeleted = TRUE;
+
if (m_clientArea)
+ {
XtRemoveEventHandler((Widget) m_clientArea, ExposureMask, FALSE,
wxUniversalRepaintProc, (XtPointer) this);
+ XtRemoveEventHandler((Widget) m_clientArea, ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask,
+ FALSE,
+ wxFrameEventHandler, (XtPointer) this);
+ wxDeleteWindowFromTable((Widget) m_clientArea);
+ }
if (GetMainWidget())
Show(FALSE);
wxModelessWindows.DeleteObject(this);
if (m_frameStatusBar)
+ {
delete m_frameStatusBar;
+ m_frameStatusBar = NULL;
+ }
DestroyChildren();
- /*
- int i;
- for (i = 0; i < wxMAX_STATUS; i++)
- if (statusTextWidget[i])
- XtDestroyWidget (statusTextWidget[i]);
-
- if (statusLineForm)
- XtDestroyWidget (statusLineForm);
-
- if (statusLineWidget)
- XtDestroyWidget (statusLineWidget);
- */
-
if (m_workArea)
{
wxDeleteWindowFromTable((Widget) m_workArea);
wxTheApp->ExitMainLoop();
}
}
-
}
// Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.
-void wxFrame::GetClientSize(int *x, int *y) const
+void wxFrame::DoGetClientSize(int *x, int *y) const
{
Dimension xx, yy;
XtVaGetValues((Widget) m_workArea, XmNwidth, &xx, XmNheight, &yy, NULL);
}
-void wxFrame::GetSize(int *width, int *height) const
+void wxFrame::DoGetSize(int *width, int *height) const
{
Dimension xx, yy;
XtVaGetValues((Widget) m_frameShell, XmNwidth, &xx, XmNheight, &yy, NULL);
*width = xx; *height = yy;
}
-void wxFrame::GetPosition(int *x, int *y) const
+void wxFrame::DoGetPosition(int *x, int *y) const
{
Window parent_window = XtWindow((Widget) m_frameShell),
next_parent = XtWindow((Widget) m_frameShell),
if (y) *y = yy;
}
-void wxFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+void wxFrame::DoSetSize(int x, int y, int width, int height, int WXUNUSED(sizeFlags))
{
if (x > -1)
XtVaSetValues((Widget) m_frameShell, XmNx, x, NULL);
XtVaSetValues((Widget) m_frameShell, XmNiconic, (Boolean)iconize, NULL);
}
-// Equivalent to maximize/restore in Windows
+void wxFrame::Restore()
+{
+ if ( m_frameShell )
+ XtVaSetValues((Widget) m_frameShell, XmNiconic, FALSE, NULL);
+}
+
void wxFrame::Maximize(bool maximize)
{
Show(TRUE);
- if (maximize && m_frameShell)
- XtVaSetValues((Widget) m_frameShell, XmNiconic, FALSE, NULL);
+ if ( maximize )
+ Restore();
}
bool wxFrame::IsIconized() const
}
// Is it maximized?
-bool wxFrame::IsMaximized(void) const
+bool wxFrame::IsMaximized() const
{
// No maximizing in Motif (?)
return FALSE;
if (!title.IsNull())
XtVaSetValues((Widget) m_frameShell,
- XmNtitle, (const char*) title,
- XmNiconName, (const char*) title,
+ XmNtitle, title.c_str(),
+ XmNiconName, title.c_str(),
NULL);
}
-void wxFrame::SetIcon(const wxIcon& icon)
+void wxFrame::DoSetIcon(const wxIcon& icon)
{
- m_icon = icon;
-
if (!m_frameShell)
return;
XtVaSetValues((Widget) m_frameShell, XtNiconPixmap, icon.GetPixmap(), NULL);
}
-wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
- const wxString& name)
+void wxFrame::SetIcon(const wxIcon& icon)
{
- wxStatusBar *statusBar = NULL;
-
- statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20),
- style, name);
-
- // Set the height according to the font and the border size
- wxClientDC dc(statusBar);
- dc.SetFont(statusBar->GetFont());
-
- long x, y;
- dc.GetTextExtent("X", &x, &y);
-
- int height = (int)( (y * 1.1) + 2* statusBar->GetBorderY());
-
- statusBar->SetSize(-1, -1, 100, height);
-
- statusBar->SetFieldsCount(number);
- return statusBar;
+ SetIcons( wxIconBundle( icon ) );
}
-wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id,
- const wxString& name)
+void wxFrame::SetIcons(const wxIconBundle& icons)
{
- // Calling CreateStatusBar twice is an error.
- wxCHECK_MSG( m_frameStatusBar == NULL, FALSE,
- "recreating status bar in wxFrame" );
+ wxFrameBase::SetIcons( icons );
- m_frameStatusBar = OnCreateStatusBar(number, style, id,
- name);
- if ( m_frameStatusBar )
- {
- PositionStatusBar();
- return m_frameStatusBar;
- }
- else
- return NULL;
-}
-
-void wxFrame::SetStatusText(const wxString& text, int number)
-{
- wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
-
- m_frameStatusBar->SetStatusText(text, number);
-}
-
-void wxFrame::SetStatusWidths(int n, const int widths_field[])
-{
- wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
+ if (!m_frameShell)
+ return;
- m_frameStatusBar->SetStatusWidths(n, widths_field);
- PositionStatusBar();
+ DoSetIcon( m_icons.GetIcon( -1 ) );
+ wxSetIconsX11(GetXDisplay(),
+ (WXWindow) XtWindow( (Widget) m_frameShell ), icons);
}
void wxFrame::PositionStatusBar()
m_frameMenuBar->CreateMenuBar(this);
}
-void wxFrame::Fit()
-{
- // Work out max. size
- wxNode *node = GetChildren().First();
- int max_width = 0;
- int max_height = 0;
- while (node)
- {
- // Find a child that's a subwindow, but not a dialog box.
- wxWindow *win = (wxWindow *)node->Data();
-
- if (!win->IsKindOf(CLASSINFO(wxFrame)) &&
- !win->IsKindOf(CLASSINFO(wxDialog)))
- {
- int width, height;
- int x, y;
- win->GetSize(&width, &height);
- win->GetPosition(&x, &y);
-
- if ((x + width) > max_width)
- max_width = x + width;
- if ((y + height) > max_height)
- max_height = y + height;
- }
- node = node->Next();
- }
- SetClientSize(max_width, max_height);
-}
-
// Responds to colour changes, and passes event on to children.
void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
Refresh();
if ( m_frameStatusBar )
wxWindow::OnSysColourChanged(event);
}
-// Default resizing behaviour - if only ONE subwindow,
-// resize to client rectangle size
-void wxFrame::OnSize(wxSizeEvent& event)
-{
- // if we're using constraints - do use them
-#if wxUSE_CONSTRAINTS
- if ( GetAutoLayout() ) {
- Layout();
- return;
- }
-#endif
-
- // do we have _exactly_ one child?
- wxWindow *child = NULL;
- for ( wxNode *node = GetChildren().First(); node; node = node->Next() )
- {
- wxWindow *win = (wxWindow *)node->Data();
- if ( !win->IsKindOf(CLASSINFO(wxFrame)) &&
- !win->IsKindOf(CLASSINFO(wxDialog)) &&
- (win != GetStatusBar())
-#if wxUSE_TOOLBAR
- && (win != GetToolBar())
-#endif // wxUSE_TOOLBAR
- )
- {
- if ( child )
- return; // it's our second subwindow - nothing to do
- child = win;
- }
- }
-
- if ( child ) {
- // we have exactly one child - set it's size to fill the whole frame
- int clientW, clientH;
- GetClientSize(&clientW, &clientH);
-
- int x = 0;
- int y = 0;
-
- child->SetSize(x, y, clientW, clientH);
- }
-}
-
// Default activation behaviour - set the focus for the first child
// subwindow found.
void wxFrame::OnActivate(wxActivateEvent& event)
{
+ if (!event.GetActive())
+ return;
+
for(wxNode *node = GetChildren().First(); node; node = node->Next())
{
// Find a child that's a subwindow, but not a dialog box.
}
}
-// The default implementation for the close window event.
-// OnClose for backward compatibility.
-
-void wxFrame::OnCloseWindow(wxCloseEvent& event)
-{
- this->Destroy();
-}
-
-// Destroy the window (delayed, if a managed window)
-bool wxFrame::Destroy()
-{
- if (!wxPendingDelete.Member(this))
- wxPendingDelete.Append(this);
- return TRUE;
-}
-
-// Default menu selection behaviour - display a help string
-void wxFrame::OnMenuHighlight(wxMenuEvent& event)
-{
- if (GetStatusBar())
- {
- if (event.GetMenuId() == -1)
- SetStatusText("");
- else
- {
- wxMenuBar *menuBar = GetMenuBar();
- if (menuBar)
- {
- wxString helpString(menuBar->GetHelpString(event.GetMenuId()));
- if (helpString != "")
- SetStatusText(helpString);
- }
- }
- }
-}
-
-wxMenuBar *wxFrame::GetMenuBar() const
-{
- return m_frameMenuBar;
-}
-
-void wxFrame::Centre(int direction)
-{
- int display_width, display_height, width, height, x, y;
- wxDisplaySize(&display_width, &display_height);
-
- GetSize(&width, &height);
- GetPosition(&x, &y);
-
- if (direction & wxHORIZONTAL)
- x = (int)((display_width - width)/2);
- if (direction & wxVERTICAL)
- y = (int)((display_height - height)/2);
-
- SetSize(x, y, width, height);
-}
-
-// Call this to simulate a menu command
-void wxFrame::Command(int id)
-{
- ProcessCommand(id);
-}
-
-void wxFrame::ProcessCommand(int id)
-{
- wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
- commandEvent.SetInt( id );
- commandEvent.SetEventObject( this );
-
- wxMenuBar *bar = GetMenuBar() ;
- if (!bar)
- return;
-
-/* TODO: check the menu item if required
- wxMenuItem *item = bar->FindItemForId(id) ;
- if (item && item->IsCheckable())
- {
- bar->Check(id,!bar->Checked(id)) ;
- }
-*/
-
- wxEvtHandler* evtHandler = GetEventHandler();
-
- evtHandler->ProcessEvent(commandEvent);
-}
-
-// Checks if there is a toolbar, and returns the first free client position
-wxPoint wxFrame::GetClientAreaOrigin() const
-{
- wxPoint pt(0, 0);
#if wxUSE_TOOLBAR
- if (GetToolBar())
- {
- int w, h;
- GetToolBar()->GetSize(& w, & h);
- if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
- {
- pt.x += w;
- }
- else
- {
- pt.y += h;
- }
- }
-#endif // wxUSE_TOOLBAR
-
- return pt;
-}
-
-void wxFrame::ScreenToClient(int *x, int *y) const
-{
- wxWindow::ScreenToClient(x, y);
-
- // We may be faking the client origin.
- // So a window that's really at (0, 30) may appear
- // (to wxWin apps) to be at (0, 0).
- wxPoint pt(GetClientAreaOrigin());
- *x -= pt.x;
- *y -= pt.y;
-}
-
-void wxFrame::ClientToScreen(int *x, int *y) const
+wxToolBar* wxFrame::CreateToolBar(long style,
+ wxWindowID id,
+ const wxString& name)
{
- // We may be faking the client origin.
- // So a window that's really at (0, 30) may appear
- // (to wxWin apps) to be at (0, 0).
- wxPoint pt1(GetClientAreaOrigin());
- *x += pt1.x;
- *y += pt1.y;
-
- wxWindow::ClientToScreen(x, y);
-}
-
-#if wxUSE_TOOLBAR
-wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
-{
- wxCHECK_MSG( m_frameToolBar == NULL, FALSE,
- "recreating toolbar in wxFrame" );
-
- wxToolBar* toolBar = OnCreateToolBar(style, id, name);
- if (toolBar)
+ if ( wxFrameBase::CreateToolBar(style, id, name) )
{
- SetToolBar(toolBar);
PositionToolBar();
- return toolBar;
}
- else
- {
- return NULL;
- }
-}
-
-wxToolBar* wxFrame::OnCreateToolBar(long style, wxWindowID id, const wxString& name)
-{
- return new wxToolBar(this, id, wxPoint(0, 0), wxSize(100, 24), style, name);
-}
-void wxFrame::SetToolBar(wxToolBar *toolbar)
-{
- m_frameToolBar = toolbar;
-}
-
-wxToolBar *wxFrame::GetToolBar() const
-{
return m_frameToolBar;
}
void wxFrame::PositionToolBar()
{
- int cw, ch;
-
- GetClientSize(& cw, &ch);
-
if (GetToolBar())
{
+ int cw, ch;
+ GetClientSize(& cw, &ch);
+
int tw, th;
GetToolBar()->GetSize(& tw, & th);
}
#endif // wxUSE_TOOLBAR
-void wxFrame::CaptureMouse()
-{
- if (m_winCaptured)
- return;
-
- if (GetMainWidget())
- XtAddGrab((Widget) m_frameShell, TRUE, FALSE);
- m_winCaptured = TRUE;
-}
-
-void wxFrame::ReleaseMouse()
-{
- if (!m_winCaptured)
- return;
-
- if (GetMainWidget())
- XtRemoveGrab((Widget) m_frameShell);
- m_winCaptured = FALSE;
-}
-
-void wxFrame::Raise(void)
+void wxFrame::Raise()
{
Window parent_window = XtWindow((Widget) m_frameShell),
next_parent = XtWindow((Widget) m_frameShell),
XRaiseWindow(XtDisplay((Widget) m_frameShell), parent_window);
}
-void wxFrame::Lower(void)
+void wxFrame::Lower()
{
Window parent_window = XtWindow((Widget) m_frameShell),
next_parent = XtWindow((Widget) m_frameShell),
XLowerWindow(XtDisplay((Widget) m_frameShell), parent_window);
}
-void wxFrameFocusProc(Widget workArea, XtPointer clientData,
- XmAnyCallbackStruct *cbs)
+void wxFrameFocusProc(Widget WXUNUSED(workArea), XtPointer WXUNUSED(clientData),
+ XmAnyCallbackStruct *WXUNUSED(cbs))
{
// wxDebugMsg("focus proc from frame %ld\n",(long)frame);
// TODO
#if wxUSE_TOOLBAR
PositionToolBar();
#endif // wxUSE_TOOLBAR
+
+#if wxUSE_STATUSBAR
PositionStatusBar();
+#endif // wxUSE_STATUSBAR
+
return TRUE;
}
return m_clientArea;
}
-void wxFrame::ChangeFont(bool keepOriginalSize)
+void wxFrame::ChangeFont(bool WXUNUSED(keepOriginalSize))
{
// TODO
}
DoChangeForegroundColour(GetClientWidget(), m_foregroundColour);
}
-void wxCloseFrameCallback(Widget widget, XtPointer client_data, XmAnyCallbackStruct *cbs)
+void wxCloseFrameCallback(Widget WXUNUSED(widget), XtPointer client_data, XmAnyCallbackStruct *WXUNUSED(cbs))
{
wxFrame *frame = (wxFrame *)client_data;
frame->GetEventHandler()->ProcessEvent(closeEvent);
}
+static void wxFrameEventHandler(Widget wid,
+ XtPointer WXUNUSED(client_data),
+ XEvent* event,
+ Boolean* continueToDispatch)
+{
+ wxFrame *frame = (wxFrame *)wxGetWindowFromTable(wid);
+ if (frame)
+ {
+ wxMouseEvent wxevent(wxEVT_NULL);
+ if (wxTranslateMouseEvent(wxevent, frame, wid, event))
+ {
+ wxevent.SetEventObject(frame);
+ wxevent.SetId(frame->GetId());
+ frame->GetEventHandler()->ProcessEvent(wxevent);
+ }
+ else
+ {
+ // An attempt to implement OnCharHook by calling OnCharHook first;
+ // if this returns TRUE, set continueToDispatch to False
+ // (don't continue processing).
+ // Otherwise set it to True and call OnChar.
+ wxKeyEvent keyEvent(wxEVT_CHAR);
+ if (wxTranslateKeyEvent(keyEvent, frame, wid, event))
+ {
+ keyEvent.SetEventObject(frame);
+ keyEvent.SetId(frame->GetId());
+ keyEvent.SetEventType(wxEVT_CHAR_HOOK);
+ if (frame->GetEventHandler()->ProcessEvent(keyEvent))
+ {
+ *continueToDispatch = False;
+ return;
+ }
+ else
+ {
+ // For simplicity, OnKeyDown is the same as OnChar
+ // TODO: filter modifier key presses from OnChar
+ keyEvent.SetEventType(wxEVT_KEY_DOWN);
+
+ // Only process OnChar if OnKeyDown didn't swallow it
+ if (!frame->GetEventHandler()->ProcessEvent (keyEvent))
+ {
+ keyEvent.SetEventType(wxEVT_CHAR);
+ frame->GetEventHandler()->ProcessEvent(keyEvent);
+ }
+ }
+ }
+ }
+ }
+ *continueToDispatch = True;
+}
projects / wxWidgets.git / blobdiff