static bool wxTopLevelUsed = FALSE;
#if !USE_SHARED_LIBRARY
-BEGIN_EVENT_TABLE(wxFrame, wxWindowBase)
+BEGIN_EVENT_TABLE(wxFrame, wxWindow)
EVT_SIZE(wxFrame::OnSize)
EVT_ACTIVATE(wxFrame::OnActivate)
EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
EVT_CLOSE(wxFrame::OnCloseWindow)
END_EVENT_TABLE()
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindowBase)
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
#endif
#if wxUSE_NATIVE_STATUSBAR
int x = pos.x, y = pos.y;
int width = size.x, height = size.y;
-
- // Set reasonable values for position and size if defaults have
- // been requested
- //
- // MB TODO: something better than these arbitrary values ?
+
+ // Set reasonable values for position and size if defaults have been
+ // requested
//
- if ( width == -1 ) width = 400;
- if ( height = -1 ) height = 400;
+ // 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 displayW, displayH;
wxDisplaySize( &displayW, &displayH );
if ( y == -1 )
{
y = (displayH - height) / 2;
- if (y < 10) y = 10;
+ if (y < 10) y = 10;
}
-
+
if (wxTopLevelUsed)
{
// Change suggested by Matthew Flatt
wxFrame::~wxFrame()
{
m_isBeingDeleted = TRUE;
-
+
if (m_clientArea)
XtRemoveEventHandler((Widget) m_clientArea, ExposureMask, FALSE,
wxUniversalRepaintProc, (XtPointer) this);