X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/024f89f972a6787e82d77fc5e5dac302a56abbb0..2e14066008229145e2da7b9f05a478ce38631f83:/src/motif/toplevel.cpp diff --git a/src/motif/toplevel.cpp b/src/motif/toplevel.cpp index 40b9fc446b..ec58a6fa71 100644 --- a/src/motif/toplevel.cpp +++ b/src/motif/toplevel.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: motif/toplevel.cpp +// Name: src/motif/toplevel.cpp // Purpose: wxTopLevelWindow Motif implementation // Author: Mattia Barbon // Modified by: @@ -17,21 +17,18 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "toplevel.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #include "wx/toplevel.h" +#include "wx/settings.h" #include "wx/app.h" +#ifndef WX_PRECOMP + #include "wx/app.h" +#endif + #ifdef __VMS__ -#define XtDisplay XTDISPLAY -#define XtParent XTPARENT -#define XtScreen XTSCREEN -#define XtWindow XTWINDOW #pragma message disable nosimpint #endif @@ -69,16 +66,7 @@ static void wxTLWEventHandler( Widget wid, void wxTopLevelWindowMotif::PreDestroy() { -#ifdef __VMS -#pragma message disable codcauunr -#endif - if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL ) - wxModelessWindows.DeleteObject(this); -#ifdef __VMS -#pragma message enable codcauunr -#endif - - m_icons.m_icons.Empty(); + wxModelessWindows.DeleteObject(this); DestroyChildren(); @@ -88,7 +76,7 @@ void wxTopLevelWindowMotif::PreDestroy() XtRemoveEventHandler( (Widget)GetClientWidget(), ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask, - FALSE, + False, wxTLWEventHandler, (XtPointer)this ); } @@ -101,7 +89,7 @@ wxTopLevelWindowMotif::~wxTopLevelWindowMotif() void wxTopLevelWindowMotif::Init() { - m_isShown = FALSE; + m_isShown = false; } bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id, @@ -116,14 +104,17 @@ bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id, if ( parent ) parent->AddChild(this); - + wxTopLevelWindows.Append(this); m_windowId = ( id > -1 ) ? id : NewControlId(); + // MBN: More backward compatible, but uglier + m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); + m_inheritFont = true; - bool retval = DoCreate( parent, id, title, pos, size, style, name ); + bool retval = XmDoCreateTLW( parent, id, title, pos, size, style, name ); - if( !retval ) return FALSE; + if( !retval ) return false; // Intercept CLOSE messages from the window manager Widget shell = (Widget)GetShellWidget(); @@ -140,7 +131,7 @@ bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id, // Modified Steve Hammes for Motif 2.0 #if (XmREVISION > 1 || XmVERSION > 1) XmAddWMProtocolCallback( shell, WM_DELETE_WINDOW, - (XtCallbackProc)wxCloseTLWCallback, + (XtCallbackProc)wxCloseTLWCallback, (XtPointer)this ); #elif XmREVISION == 1 XmAddWMProtocolCallback( shell, WM_DELETE_WINDOW, @@ -155,15 +146,16 @@ bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id, if( XmIsMotifWMRunning( shell ) ) { int decor = 0 ; + if( !(m_windowStyle & wxNO_BORDER) ) + decor |= MWM_DECOR_BORDER; if( m_windowStyle & wxRESIZE_BORDER ) decor |= MWM_DECOR_RESIZEH; if( m_windowStyle & wxSYSTEM_MENU ) decor |= MWM_DECOR_MENU; if( ( m_windowStyle & wxCAPTION ) || - ( m_windowStyle & wxTINY_CAPTION_HORIZ ) || - ( m_windowStyle & wxTINY_CAPTION_VERT ) ) + ( m_windowStyle & wxTINY_CAPTION) ) decor |= MWM_DECOR_TITLE; - if( m_windowStyle & wxTHICK_FRAME ) + if( m_windowStyle & wxRESIZE_BORDER ) decor |= MWM_DECOR_BORDER; if( m_windowStyle & wxMINIMIZE_BOX ) decor |= MWM_DECOR_MINIMIZE; @@ -180,14 +172,14 @@ bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id, // no-decorations case. if( ( m_windowStyle & wxCAPTION ) != wxCAPTION ) XtVaSetValues( shell, - XmNoverrideRedirect, TRUE, + XmNoverrideRedirect, True, NULL ); } XtAddEventHandler( (Widget)GetClientWidget(), - ButtonPressMask | ButtonReleaseMask | + ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask, - FALSE, + False, wxTLWEventHandler, (XtPointer)this ); @@ -272,17 +264,17 @@ WXWidget wxTopLevelWindowMotif::GetShellWidget() const return (WXWidget) GetShell( this ); } -bool wxTopLevelWindowMotif::ShowFullScreen( bool show, - long style ) +bool wxTopLevelWindowMotif::ShowFullScreen( bool WXUNUSED(show), + long WXUNUSED(style) ) { // TODO, see wxGTK - return FALSE; + return false; } bool wxTopLevelWindowMotif::IsFullScreen() const { // TODO, see wxGTK - return FALSE; + return false; } void wxTopLevelWindowMotif::Restore() @@ -291,7 +283,7 @@ void wxTopLevelWindowMotif::Restore() if( shell ) XtVaSetValues( shell, - XmNiconic, FALSE, + XmNiconic, False, NULL ); } @@ -301,7 +293,7 @@ void wxTopLevelWindowMotif::Iconize( bool iconize ) if( !shell ) return; if( !iconize ) - Show( TRUE ); + Show( true ); XtVaSetValues( shell, XmNiconic, (Boolean)iconize, @@ -313,19 +305,19 @@ bool wxTopLevelWindowMotif::IsIconized() const Widget shell = GetShell( this ); if( !shell ) - return FALSE; + return false; Boolean iconic; XtVaGetValues( shell, XmNiconic, &iconic, NULL ); - return iconic; + return (iconic == True); } void wxTopLevelWindowMotif::Maximize( bool maximize ) { - Show( TRUE ); + Show( true ); if( maximize ) Restore(); @@ -333,7 +325,7 @@ void wxTopLevelWindowMotif::Maximize( bool maximize ) bool wxTopLevelWindowMotif::IsMaximized() const { - return FALSE; + return false; } void wxTopLevelWindowMotif::DoSetSizeHints( int minW, int minH, @@ -352,7 +344,7 @@ void wxTopLevelWindowMotif::DoSetSizeHints( int minW, int minH, if( incW > -1 ) { XtSetArg( args[count], XmNwidthInc, incW ); ++count; } if( incH > -1 ) { XtSetArg( args[count], XmNheightInc, incH ); ++count; } - XtSetValues( (Widget)GetShellWidget(), args, count ); + XtSetValues( (Widget)GetShellWidget(), args, count ); } bool wxTopLevelWindowMotif::SetShape( const wxRegion& region ) @@ -375,7 +367,7 @@ static void wxCloseTLWCallback( Widget WXUNUSED(widget), XtPointer client_data, closeEvent.SetEventObject( tlw ); // May delete the dialog (with delayed deletion) - tlw->GetEventHandler()->ProcessEvent(closeEvent); + tlw->HandleWindowEvent(closeEvent); } void wxTLWEventHandler( Widget wid, @@ -394,12 +386,12 @@ void wxTLWEventHandler( Widget wid, { wxevent.SetEventObject( tlw ); wxevent.SetId( tlw->GetId() ); - tlw->GetEventHandler()->ProcessEvent( wxevent ); + tlw->HandleWindowEvent( wxevent ); } else { // An attempt to implement OnCharHook by calling OnCharHook first; - // if this returns TRUE, set continueToDispatch to False + // if this returns true, set continueToDispatch to False // (don't continue processing). // Otherwise set it to True and call OnChar. wxKeyEvent keyEvent( wxEVT_CHAR ); @@ -408,7 +400,7 @@ void wxTLWEventHandler( Widget wid, keyEvent.SetEventObject( tlw ); keyEvent.SetId( tlw->GetId() ); keyEvent.SetEventType( wxEVT_CHAR_HOOK ); - if( tlw->GetEventHandler()->ProcessEvent( keyEvent ) ) + if( tlw->HandleWindowEvent( keyEvent ) ) { *continueToDispatch = False; return; @@ -420,10 +412,10 @@ void wxTLWEventHandler( Widget wid, keyEvent.SetEventType( wxEVT_KEY_DOWN ); // Only process OnChar if OnKeyDown didn't swallow it - if( !tlw->GetEventHandler()->ProcessEvent( keyEvent ) ) + if( !tlw->HandleWindowEvent( keyEvent ) ) { keyEvent.SetEventType( wxEVT_CHAR ); - tlw->GetEventHandler()->ProcessEvent( keyEvent ); + tlw->HandleWindowEvent( keyEvent ); } } } @@ -432,4 +424,3 @@ void wxTLWEventHandler( Widget wid, *continueToDispatch = True; } -