projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No real changes, just use wxString::clear() instead of assignment.
[wxWidgets.git]
/
src
/
motif
/
toplevel.cpp
diff --git
a/src/motif/toplevel.cpp
b/src/motif/toplevel.cpp
index a51ad28e8b3371dd18ec12367017650f606723a9..ec58a6fa7191129108dbaadee26ee65ae1a599bd 100644
(file)
--- a/
src/motif/toplevel.cpp
+++ b/
src/motif/toplevel.cpp
@@
-21,13
+21,14
@@
#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__
#ifdef __VMS__
-#define XtDisplay XTDISPLAY
-#define XtParent XTPARENT
-#define XtScreen XTSCREEN
-#define XtWindow XTWINDOW
#pragma message disable nosimpint
#endif
#pragma message disable nosimpint
#endif
@@
-67,8
+68,6
@@
void wxTopLevelWindowMotif::PreDestroy()
{
wxModelessWindows.DeleteObject(this);
{
wxModelessWindows.DeleteObject(this);
- m_icons.m_icons.Empty();
-
DestroyChildren();
// MessageDialog and FileDialog do not have a client widget
DestroyChildren();
// MessageDialog and FileDialog do not have a client widget
@@
-109,6
+108,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 );
@@
-151,8
+153,7
@@
bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id,
if( m_windowStyle & wxSYSTEM_MENU )
decor |= MWM_DECOR_MENU;
if( ( m_windowStyle & wxCAPTION ) ||
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 & wxRESIZE_BORDER )
decor |= MWM_DECOR_BORDER;
decor |= MWM_DECOR_TITLE;
if( m_windowStyle & wxRESIZE_BORDER )
decor |= MWM_DECOR_BORDER;
@@
-366,7
+367,7
@@
static void wxCloseTLWCallback( Widget WXUNUSED(widget), XtPointer client_data,
closeEvent.SetEventObject( tlw );
// May delete the dialog (with delayed deletion)
closeEvent.SetEventObject( tlw );
// May delete the dialog (with delayed deletion)
- tlw->
GetEventHandler()->Process
Event(closeEvent);
+ tlw->
HandleWindow
Event(closeEvent);
}
void wxTLWEventHandler( Widget wid,
}
void wxTLWEventHandler( Widget wid,
@@
-385,7
+386,7
@@
void wxTLWEventHandler( Widget wid,
{
wxevent.SetEventObject( tlw );
wxevent.SetId( tlw->GetId() );
{
wxevent.SetEventObject( tlw );
wxevent.SetId( tlw->GetId() );
- tlw->
GetEventHandler()->Process
Event( wxevent );
+ tlw->
HandleWindow
Event( wxevent );
}
else
{
}
else
{
@@
-399,7
+400,7
@@
void wxTLWEventHandler( Widget wid,
keyEvent.SetEventObject( tlw );
keyEvent.SetId( tlw->GetId() );
keyEvent.SetEventType( wxEVT_CHAR_HOOK );
keyEvent.SetEventObject( tlw );
keyEvent.SetId( tlw->GetId() );
keyEvent.SetEventType( wxEVT_CHAR_HOOK );
- if( tlw->
GetEventHandler()->Process
Event( keyEvent ) )
+ if( tlw->
HandleWindow
Event( keyEvent ) )
{
*continueToDispatch = False;
return;
{
*continueToDispatch = False;
return;
@@
-411,10
+412,10
@@
void wxTLWEventHandler( Widget wid,
keyEvent.SetEventType( wxEVT_KEY_DOWN );
// Only process OnChar if OnKeyDown didn't swallow it
keyEvent.SetEventType( wxEVT_KEY_DOWN );
// Only process OnChar if OnKeyDown didn't swallow it
- if( !tlw->
GetEventHandler()->Process
Event( keyEvent ) )
+ if( !tlw->
HandleWindow
Event( keyEvent ) )
{
keyEvent.SetEventType( wxEVT_CHAR );
{
keyEvent.SetEventType( wxEVT_CHAR );
- tlw->
GetEventHandler()->Process
Event( keyEvent );
+ tlw->
HandleWindow
Event( keyEvent );
}
}
}
}
}
}