applied patch 424550 (fix compilation of the notebook sample in tabbed dialog mode)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -20,10 +20,11 @@
 | 
			
		||||
    #include "wx/wx.h"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
// If 1, use a dialog. Otherwise use a frame.
 | 
			
		||||
#define USE_TABBED_DIALOG 1
 | 
			
		||||
 | 
			
		||||
#include "notebook.h"
 | 
			
		||||
 | 
			
		||||
// If 1, use a dialog. Otherwise use a frame.
 | 
			
		||||
#define USE_TABBED_DIALOG 0
 | 
			
		||||
#if USE_TABBED_DIALOG
 | 
			
		||||
MyDialog* dialog = (MyDialog *) NULL;
 | 
			
		||||
#else // !USE_TABBED_DIALOG
 | 
			
		||||
@@ -37,8 +38,8 @@ bool MyApp::OnInit()
 | 
			
		||||
  // Create the main window
 | 
			
		||||
#if USE_TABBED_DIALOG
 | 
			
		||||
  dialog = new MyDialog((wxFrame *) NULL, -1, (char *) "Notebook", wxPoint(-1, -1), wxSize(365, 390), wxDIALOG_MODAL|wxDEFAULT_DIALOG_STYLE);
 | 
			
		||||
 | 
			
		||||
  dialog->ShowModal();
 | 
			
		||||
  delete dialog;
 | 
			
		||||
 | 
			
		||||
  // Quit immediately the dialog has been dismissed
 | 
			
		||||
  return FALSE;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user