Dtor for wxHtmlCell

[wxWidgets.git] / samples / dialogs / dialogs.cpp

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index cf0d3469e74053ed29206db7a9d824d1b497053b..55bc4b3f2844aefeb27b2486427a7e45f1f0c9ec 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -27,6 +27,7 @@
 #include "wx/bookctrl.h"
 #include "wx/artprov.h"
 #include "wx/imaglist.h"
 #include "wx/bookctrl.h"
 #include "wx/artprov.h"
 #include "wx/imaglist.h"

+#include "wx/sysopt.h"

 
 #if wxUSE_COLOURDLG
     #include "wx/colordlg.h"
 
 #if wxUSE_COLOURDLG
     #include "wx/colordlg.h"


@@ -154,6 +155,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 #if USE_MODAL_PRESENTATION
     EVT_MENU(DIALOGS_MODAL,                         MyFrame::ModalDlg)
     EVT_MENU(DIALOGS_MODELESS,                      MyFrame::ModelessDlg)
 #if USE_MODAL_PRESENTATION
     EVT_MENU(DIALOGS_MODAL,                         MyFrame::ModalDlg)
     EVT_MENU(DIALOGS_MODELESS,                      MyFrame::ModelessDlg)

+    EVT_MENU(DIALOGS_CENTRE_SCREEN,                 MyFrame::DlgCenteredScreen)
+    EVT_MENU(DIALOGS_CENTRE_PARENT,                 MyFrame::DlgCenteredParent)

 #endif // USE_MODAL
 
 #if wxUSE_STARTUP_TIPS
 #endif // USE_MODAL
 
 #if wxUSE_STARTUP_TIPS


@@ -353,10 +356,12 @@ bool MyApp::OnInit()
 #endif // wxUSE_FINDREPLDLG
 
 #if USE_MODAL_PRESENTATION
 #endif // wxUSE_FINDREPLDLG
 
 #if USE_MODAL_PRESENTATION

-    wxMenu *modal_menu = new wxMenu;
-    modal_menu->Append(DIALOGS_MODAL, _T("Mo&dal dialog\tCtrl-W"));
-    modal_menu->AppendCheckItem(DIALOGS_MODELESS, _T("Modeless &dialog\tCtrl-Z"));
-    file_menu->Append(wxID_ANY,_T("&Modal/Modeless"),modal_menu);
+    wxMenu *dialogs_menu = new wxMenu;
+    dialogs_menu->Append(DIALOGS_MODAL, _T("&Modal dialog\tCtrl-W"));
+    dialogs_menu->AppendCheckItem(DIALOGS_MODELESS, _T("Mode&less dialog\tCtrl-Z"));
+    dialogs_menu->AppendCheckItem(DIALOGS_CENTRE_SCREEN, _T("Centered on &screen\tShift-Ctrl-1"));
+    dialogs_menu->AppendCheckItem(DIALOGS_CENTRE_PARENT, _T("Centered on &parent\tShift-Ctrl-2"));
+    file_menu->Append(wxID_ANY, _T("&Generic dialogs"), dialogs_menu);

 #endif // USE_MODAL_PRESENTATION
 
 #if USE_SETTINGS_DIALOG
 #endif // USE_MODAL_PRESENTATION
 
 #if USE_SETTINGS_DIALOG


@@ -819,6 +824,10 @@ void MyFrame::FileOpenGeneric(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::FilesOpenGeneric(wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::FilesOpenGeneric(wxCommandEvent& WXUNUSED(event) )
 {

+    // On PocketPC you can disable OK-only dialogs policy using system option
+    int buttons = wxSystemOptions::GetOptionInt(wxT("wince.dialog.real-ok-cancel"));
+    wxSystemOptions::SetOption(wxT("wince.dialog.real-ok-cancel"), 1);
+

     wxString wildcards = _T("All files (*.*)|*.*|C++ files (*.cpp;*.h)|*.cpp;*.h");
     wxGenericFileDialog dialog(this, _T("Testing open multiple file dialog"),
                         wxEmptyString, wxEmptyString, wildcards,
     wxString wildcards = _T("All files (*.*)|*.*|C++ files (*.cpp;*.h)|*.cpp;*.h");
     wxGenericFileDialog dialog(this, _T("Testing open multiple file dialog"),
                         wxEmptyString, wxEmptyString, wildcards,


@@ -846,6 +855,9 @@ void MyFrame::FilesOpenGeneric(wxCommandEvent& WXUNUSED(event) )
         wxMessageDialog dialog2(this, msg, _T("Selected files"));
         dialog2.ShowModal();
     }
         wxMessageDialog dialog2(this, msg, _T("Selected files"));
         dialog2.ShowModal();
     }

+
+    // restore system option
+    wxSystemOptions::SetOption(wxT("wince.dialog.real-ok-cancel"), buttons);

 }
 
 void MyFrame::FileSaveGeneric(wxCommandEvent& WXUNUSED(event) )
 }
 
 void MyFrame::FileSaveGeneric(wxCommandEvent& WXUNUSED(event) )


@@ -942,6 +954,25 @@ void MyFrame::ModelessDlg(wxCommandEvent& event)
             m_dialog->Hide();
     }
 }
             m_dialog->Hide();
     }
 }

+
+void MyFrame::DlgCenteredScreen(wxCommandEvent& WXUNUSED(event))
+{
+    wxDialog dlg(this, wxID_ANY, _T("Dialog centered on screen"),
+                 wxDefaultPosition, wxSize(200, 100));
+    new wxButton(&dlg, wxID_OK, _T("Close"), wxPoint(10, 10));
+    dlg.CentreOnScreen();
+    dlg.ShowModal();
+}
+
+void MyFrame::DlgCenteredParent(wxCommandEvent& WXUNUSED(event))
+{
+    wxDialog dlg(this, wxID_ANY, _T("Dialog centered on parent"),
+                 wxDefaultPosition, wxSize(200, 100));
+    new wxButton(&dlg, wxID_OK, _T("Close"), wxPoint(10, 10));
+    dlg.CentreOnParent();
+    dlg.ShowModal();
+}
+

 #endif // USE_MODAL_PRESENTATION
 
 #if wxUSE_STARTUP_TIPS
 #endif // USE_MODAL_PRESENTATION
 
 #if wxUSE_STARTUP_TIPS


@@ -1389,7 +1420,7 @@ SettingsDialog::SettingsDialog(wxWindow* win, bool useToolBook)
 
     int tabImage1 = -1;
     int tabImage2 = -1;
 
     int tabImage1 = -1;
     int tabImage2 = -1;

-    
+

     if (useToolBook)
     {
         tabImage1 = 0;
     if (useToolBook)
     {
         tabImage1 = 0;


@@ -1419,7 +1450,7 @@ SettingsDialog::SettingsDialog(wxWindow* win, bool useToolBook)
 #endif
     );
 
 #endif
     );
 

-    // If using a toolbook, also follow Mac style and don't create buttons    
+    // If using a toolbook, also follow Mac style and don't create buttons

     if (!useToolBook)
         CreateButtons(wxOK|wxCANCEL
 #ifndef __POCKETPC__
     if (!useToolBook)
         CreateButtons(wxOK|wxCANCEL
 #ifndef __POCKETPC__