Use a GtkVBox to do TLW layout. Rework some of the remaining sizing code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -13,18 +13,12 @@
|
||||
#include "wx/dialog.h"
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/app.h"
|
||||
#include "wx/frame.h"
|
||||
#include "wx/cursor.h"
|
||||
#endif // WX_PRECOMP
|
||||
|
||||
#include "wx/evtloop.h"
|
||||
|
||||
#include <gdk/gdk.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
|
||||
#include "wx/gtk/win_gtk.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// global data
|
||||
@@ -42,7 +36,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
|
||||
void wxDialog::Init()
|
||||
{
|
||||
m_returnCode = 0;
|
||||
m_sizeSet = false;
|
||||
m_modalShowing = false;
|
||||
m_themeEnabled = true;
|
||||
}
|
||||
@@ -77,16 +70,6 @@ bool wxDialog::Show( bool show )
|
||||
EndModal( wxID_CANCEL );
|
||||
}
|
||||
|
||||
if (show && !m_sizeSet)
|
||||
{
|
||||
/* by calling GtkOnSize here, we don't have to call
|
||||
either after showing the frame, which would entail
|
||||
much ugly flicker nor from within the size_allocate
|
||||
handler, because GTK 1.1.X forbids that. */
|
||||
|
||||
GtkOnSize();
|
||||
}
|
||||
|
||||
bool ret = wxWindow::Show( show );
|
||||
|
||||
if (show) InitDialog();
|
||||
|
Reference in New Issue
Block a user