projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use libtiff/libjpeg VC-specific include files for all Win32 compilers, including...
[wxWidgets.git]
/
src
/
motif
/
toplevel.cpp
diff --git
a/src/motif/toplevel.cpp
b/src/motif/toplevel.cpp
index 7d0613e6b8599939b33ec4244f1f6609f29f349e..35af4ecfe61116e6ec113a463218c326f6897365 100644
(file)
--- 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:
// Purpose: wxTopLevelWindow Motif implementation
// Author: Mattia Barbon
// Modified by:
@@
-21,8
+21,13
@@
#include "wx/wxprec.h"
#include "wx/toplevel.h"
#include "wx/wxprec.h"
#include "wx/toplevel.h"
+#include "wx/settings.h"
#include "wx/app.h"
#include "wx/app.h"
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+#endif
+
#ifdef __VMS__
#define XtDisplay XTDISPLAY
#define XtParent XTPARENT
#ifdef __VMS__
#define XtDisplay XTDISPLAY
#define XtParent XTPARENT
@@
-65,16
+70,7
@@
static void wxTLWEventHandler( Widget wid,
void wxTopLevelWindowMotif::PreDestroy()
{
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();
DestroyChildren();
@@
-116,6
+112,9
@@
bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id,
wxTopLevelWindows.Append(this);
m_windowId = ( id > -1 ) ? id : NewControlId();
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 = XmDoCreateTLW( parent, id, title, pos, size, style, name );
bool retval = XmDoCreateTLW( parent, id, title, pos, size, style, name );
@@
-161,7
+160,7
@@
bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id,
( m_windowStyle & wxTINY_CAPTION_HORIZ ) ||
( m_windowStyle & wxTINY_CAPTION_VERT ) )
decor |= MWM_DECOR_TITLE;
( m_windowStyle & wxTINY_CAPTION_HORIZ ) ||
( m_windowStyle & wxTINY_CAPTION_VERT ) )
decor |= MWM_DECOR_TITLE;
- if( m_windowStyle & wx
THICK_FRAME
)
+ if( m_windowStyle & wx
RESIZE_BORDER
)
decor |= MWM_DECOR_BORDER;
if( m_windowStyle & wxMINIMIZE_BOX )
decor |= MWM_DECOR_MINIMIZE;
decor |= MWM_DECOR_BORDER;
if( m_windowStyle & wxMINIMIZE_BOX )
decor |= MWM_DECOR_MINIMIZE;
@@
-270,8
+269,8
@@
WXWidget wxTopLevelWindowMotif::GetShellWidget() const
return (WXWidget) GetShell( this );
}
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;
{
// TODO, see wxGTK
return false;
@@
-318,7
+317,7
@@
bool wxTopLevelWindowMotif::IsIconized() const
XmNiconic, &iconic,
NULL );
XmNiconic, &iconic,
NULL );
- return
iconic
;
+ return
(iconic == True)
;
}
void wxTopLevelWindowMotif::Maximize( bool maximize )
}
void wxTopLevelWindowMotif::Maximize( bool maximize )
@@
-430,4
+429,3
@@
void wxTLWEventHandler( Widget wid,
*continueToDispatch = True;
}
*continueToDispatch = True;
}
-