Support using GetTextExtent() with empty string to get descent in wxOSX.

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index ccd0c2018331e09eca06bb653afefcbc4f69b96b..3d866d9a40133e28364b97f009096173e662600b 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -1,27 +1,144 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialogs.h
 // Purpose:     Common dialogs demo
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialogs.h
 // Purpose:     Common dialogs demo

-// Author:      Julian Smart
-// Modified by:
+// Author:      Julian Smart, Vadim Zeitlin, ABX

 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+//              (c) 2004 ABX
+//              (c) Vadim Zeitlin
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+/*
+This sample shows how to use the common dialogs available from wxWidgets.
+It also shows that generic implementations of common dialogs can be exchanged
+with native dialogs and can coexist in one application. The need for generic
+dialogs addition is recognized thanks to setup of below USE_*** setting. Their
+combinations reflects conditions of makefiles and project files to avoid unresolved
+references during linking. For now some generic dialogs are added in static builds
+of MSW, MAC and OS2
+*/
+

 #ifndef __DIALOGSH__
 #define __DIALOGSH__
 
 #ifndef __DIALOGSH__
 #define __DIALOGSH__
 

+#ifdef __WXUNIVERSAL__
+    #define USE_WXUNIVERSAL 1
+#else
+    #define USE_WXUNIVERSAL 0
+#endif
+
+#ifdef WXUSINGDLL
+    #define USE_DLL 1
+#else
+    #define USE_DLL 0
+#endif
+
+#if defined(__WXWINCE__)
+    #define USE_WXWINCE 1
+#else
+    #define USE_WXWINCE 0
+#endif
+
+#if defined(__WXMSW__) && !USE_WXWINCE
+    #define USE_WXMSW 1
+#else
+    #define USE_WXMSW 0
+#endif
+
+#ifdef __WXMAC__
+    #define USE_WXMAC 1
+#else
+    #define USE_WXMAC 0
+#endif
+
+#if defined(__WXMAC_OSX__) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2) && USE_NATIVE_FONT_DIALOG_FOR_MACOSX
+    #define USE_WXMACFONTDLG 1
+#else
+    #define USE_WXMACFONTDLG 0
+#endif
+
+#ifdef __WXGTK__
+    #define USE_WXGTK 1
+#else
+    #define USE_WXGTK 0
+#endif
+
+#ifdef __WXPM__
+    #define USE_WXPM 1
+#else
+    #define USE_WXPM 0
+#endif
+
+#define USE_GENERIC_DIALOGS (!USE_WXUNIVERSAL && !USE_DLL)
+
+#define USE_COLOURDLG_GENERIC \
+    ((USE_WXMSW || USE_WXMAC) && USE_GENERIC_DIALOGS && wxUSE_COLOURDLG)
+#define USE_DIRDLG_GENERIC \
+    ((USE_WXMSW || USE_WXMAC) && USE_GENERIC_DIALOGS && wxUSE_DIRDLG)
+#define USE_FILEDLG_GENERIC \
+    ((((USE_WXMSW || USE_WXMAC || USE_WXPM || USE_WXGTK) \
+                    && USE_GENERIC_DIALOGS) || USE_WXWINCE) && wxUSE_FILEDLG)
+#define USE_FONTDLG_GENERIC \
+    ((USE_WXMSW || USE_WXMACFONTDLG || USE_WXPM) && USE_GENERIC_DIALOGS && wxUSE_FONTDLG)
+
+// Turn USE_MODAL_PRESENTATION to 0 if there is any reason for not presenting difference
+// between modal and modeless dialogs (ie. not implemented it in your port yet)
+#if defined(__SMARTPHONE__) || !wxUSE_BOOKCTRL
+    #define USE_MODAL_PRESENTATION 0
+#else
+    #define USE_MODAL_PRESENTATION 1
+#endif
+
+
+// Turn USE_SETTINGS_DIALOG to 0 if supported
+#if wxUSE_BOOKCTRL
+    #define USE_SETTINGS_DIALOG 1
+#else
+    #define USE_SETTINGS_DIALOG 0
+#endif
+
+#if wxUSE_LOG
+
+// Custom application traits class which we use to override the default log
+// target creation
+class MyAppTraits : public wxGUIAppTraits
+{
+public:
+    virtual wxLog *CreateLogTarget();
+};
+
+#endif // wxUSE_LOG
+

 // Define a new application type
 class MyApp: public wxApp
 {
 public:
 // Define a new application type
 class MyApp: public wxApp
 {
 public:

-    bool OnInit();
+    MyApp() { m_startupProgressStyle = -1; }
+
+    virtual bool OnInit();

 
 

-    wxFont       m_canvasFont;
-    wxColour     m_canvasTextColour;
+#if wxUSE_CMDLINE_PARSER
+    virtual void OnInitCmdLine(wxCmdLineParser& parser);
+    virtual bool OnCmdLineParsed(wxCmdLineParser& parser);
+#endif // wxUSE_CMDLINE_PARSER
+
+protected:
+#if wxUSE_LOG
+    virtual wxAppTraits *CreateTraits() { return new MyAppTraits; }
+#endif // wxUSE_LOG
+
+private:
+    // Flag set to a valid value if command line option "progress" is used,
+    // this allows testing of wxProgressDialog before the main event loop is
+    // started. If this option is not specified it is set to -1 by default
+    // meaning that progress dialog shouldn't be shown at all.
+    long m_startupProgressStyle;

 };
 
 };
 

+#if USE_MODAL_PRESENTATION
+

 // A custom modeless dialog
 class MyModelessDialog : public wxDialog
 {
 // A custom modeless dialog
 class MyModelessDialog : public wxDialog
 {


@@ -44,69 +161,370 @@ public:
     void OnButton(wxCommandEvent& event);
 
 private:
     void OnButton(wxCommandEvent& event);
 
 private:

-    wxButton *m_btnFocused;
-    wxButton *m_btnDelete;
+    wxButton *m_btnModal,
+             *m_btnModeless,
+             *m_btnDelete;
+
+    DECLARE_EVENT_TABLE()
+};
+
+#endif // USE_MODAL_PRESENTATION
+
+// A class demonstrating CreateStdDialogButtonSizer()
+class StdButtonSizerDialog : public wxDialog
+{
+public:
+    StdButtonSizerDialog(wxWindow *parent);
+
+    void OnEvent(wxCommandEvent& event);
+
+private:
+    void EnableDisableControls();
+
+    wxCheckBox *m_chkboxAffirmativeButton;
+    wxRadioButton *m_radiobtnOk,
+                  *m_radiobtnYes;
+
+    wxCheckBox *m_chkboxDismissButton;
+    wxRadioButton *m_radiobtnClose,
+                  *m_radiobtnCancel;
+
+    wxCheckBox *m_chkboxApply,
+               *m_chkboxNo,
+               *m_chkboxHelp,
+               *m_chkboxNoDefault;
+
+    wxSizer *m_buttonsSizer;
+
+    DECLARE_EVENT_TABLE()
+};
+
+// Test harness for wxMessageDialog.
+class TestMessageBoxDialog : public wxDialog
+{
+public:
+    TestMessageBoxDialog(wxWindow *parent);
+
+    bool Create();
+
+protected:
+    wxString GetBoxTitle() { return m_textTitle->GetValue(); }
+    wxString GetMessage() { return m_textMsg->GetValue(); }
+    long GetStyle();
+
+    void PrepareMessageDialog(wxMessageDialogBase &dlg);
+
+    virtual void AddAdditionalTextOptions(wxSizer *WXUNUSED(sizer)) { }
+    virtual void AddAdditionalFlags(wxSizer *WXUNUSED(sizer)) { }
+
+    void OnApply(wxCommandEvent& event);
+    void OnClose(wxCommandEvent& event);
+    void OnUpdateLabelUI(wxUpdateUIEvent& event);
+    void OnUpdateNoDefaultUI(wxUpdateUIEvent& event);
+
+private:
+    enum
+    {
+        Btn_Yes,
+        Btn_No,
+        Btn_Ok,
+        Btn_Cancel,
+        Btn_Help,
+        Btn_Max
+    };
+
+    struct BtnInfo
+    {
+        int flag;
+        const char *name;
+    };
+
+    static const BtnInfo ms_btnInfo[Btn_Max];
+
+    enum
+    {
+        MsgDlgIcon_No,
+        MsgDlgIcon_None,
+        MsgDlgIcon_Info,
+        MsgDlgIcon_Question,
+        MsgDlgIcon_Warning,
+        MsgDlgIcon_Error,
+        MsgDlgIcon_AuthNeeded,
+        MsgDlgIcon_Max
+    };
+
+    wxTextCtrl *m_textTitle,
+               *m_textMsg,
+               *m_textExtMsg;
+
+    wxCheckBox *m_buttons[Btn_Max];
+    wxTextCtrl *m_labels[Btn_Max];
+
+    wxRadioBox *m_icons;
+
+    wxCheckBox *m_chkNoDefault,
+               *m_chkCentre;

 
     DECLARE_EVENT_TABLE()
 
     DECLARE_EVENT_TABLE()

+    wxDECLARE_NO_COPY_CLASS(TestMessageBoxDialog);

 };
 
 };
 

+#if wxUSE_RICHMSGDLG
+class TestRichMessageDialog : public TestMessageBoxDialog
+{
+public:
+    TestRichMessageDialog(wxWindow *parent);
+
+protected:
+    // overrides method in base class
+    virtual void AddAdditionalTextOptions(wxSizer *sizer);
+    virtual void AddAdditionalFlags(wxSizer *sizer);
+
+    void OnApply(wxCommandEvent& event);
+
+private:
+    wxTextCtrl *m_textCheckBox;
+    wxCheckBox *m_initialValueCheckBox;
+    wxTextCtrl *m_textDetailed;
+
+    DECLARE_EVENT_TABLE()
+};
+#endif // wxUSE_RICHMSGDLG
+
+class TestDefaultActionDialog: public wxDialog
+{
+public:
+    TestDefaultActionDialog( wxWindow *parent );
+
+    void OnListBoxDClick(wxCommandEvent& event);
+    void OnDisableOK(wxCommandEvent& event);
+    void OnDisableCancel(wxCommandEvent& event);
+    void OnCatchListBoxDClick(wxCommandEvent& event);
+    void OnTextEnter(wxCommandEvent& event);
+
+private:
+    bool   m_catchListBoxDClick;
+
+private:
+    DECLARE_EVENT_TABLE()
+};
+
+
+#if USE_SETTINGS_DIALOG
+// Property sheet dialog
+class SettingsDialog: public wxPropertySheetDialog
+{
+DECLARE_CLASS(SettingsDialog)
+public:
+    SettingsDialog(wxWindow* parent, int dialogType);
+    ~SettingsDialog();
+
+    wxPanel* CreateGeneralSettingsPage(wxWindow* parent);
+    wxPanel* CreateAestheticSettingsPage(wxWindow* parent);
+
+protected:
+
+    enum {
+        ID_SHOW_TOOLTIPS = 100,
+        ID_AUTO_SAVE,
+        ID_AUTO_SAVE_MINS,
+        ID_LOAD_LAST_PROJECT,
+
+        ID_APPLY_SETTINGS_TO,
+        ID_BACKGROUND_STYLE,
+        ID_FONT_SIZE
+    };
+
+    wxImageList*    m_imageList;
+
+DECLARE_EVENT_TABLE()
+};
+
+#endif // USE_SETTINGS_DIALOG
+

 // Define a new frame type
 class MyFrame: public wxFrame
 {
 public:
 // Define a new frame type
 class MyFrame: public wxFrame
 {
 public:

-    MyFrame(wxWindow *parent, const wxString& title,
-            const wxPoint& pos, const wxSize& size);
+    MyFrame(const wxString& title);
+    virtual ~MyFrame();
+
+#if wxUSE_MSGDLG
+    void MessageBox(wxCommandEvent& event);
+    void MessageBoxDialog(wxCommandEvent& event);
+    void MessageBoxInfo(wxCommandEvent& event);
+    void MessageBoxWindowModal(wxCommandEvent& event);
+    void MessageBoxWindowModalClosed(wxWindowModalDialogEvent& event);
+#endif // wxUSE_MSGDLG
+#if wxUSE_RICHMSGDLG
+    void RichMessageDialog(wxCommandEvent& event);
+#endif // wxUSE_RICHMSGDLG

 
 

+#if wxUSE_COLOURDLG

     void ChooseColour(wxCommandEvent& event);
     void ChooseColour(wxCommandEvent& event);

+    void GetColour(wxCommandEvent& event);
+#endif // wxUSE_COLOURDLG
+
+#if wxUSE_FONTDLG

     void ChooseFont(wxCommandEvent& event);
     void ChooseFont(wxCommandEvent& event);

+#endif // wxUSE_FONTDLG
+
+#if wxUSE_LOG_DIALOG

     void LogDialog(wxCommandEvent& event);
     void LogDialog(wxCommandEvent& event);

-    void MessageBox(wxCommandEvent& event);
+#endif // wxUSE_LOG_DIALOG
+
+#if wxUSE_INFOBAR
+    void InfoBarSimple(wxCommandEvent& event);
+    void InfoBarAdvanced(wxCommandEvent& event);
+#endif // wxUSE_INFOBAR
+
+#if wxUSE_CHOICEDLG

     void SingleChoice(wxCommandEvent& event);
     void MultiChoice(wxCommandEvent& event);
     void SingleChoice(wxCommandEvent& event);
     void MultiChoice(wxCommandEvent& event);

+#endif // wxUSE_CHOICEDLG
+
+    void Rearrange(wxCommandEvent& event);
+
+#if wxUSE_TEXTDLG
+    void LineEntry(wxCommandEvent& event);

     void TextEntry(wxCommandEvent& event);
     void PasswordEntry(wxCommandEvent& event);
     void TextEntry(wxCommandEvent& event);
     void PasswordEntry(wxCommandEvent& event);

+#endif // wxUSE_TEXTDLG
+
+#if wxUSE_NUMBERDLG

     void NumericEntry(wxCommandEvent& event);
     void NumericEntry(wxCommandEvent& event);

+#endif // wxUSE_NUMBERDLG
+
+#if wxUSE_FILEDLG

     void FileOpen(wxCommandEvent& event);
     void FileOpen2(wxCommandEvent& event);
     void FilesOpen(wxCommandEvent& event);
     void FileSave(wxCommandEvent& event);
     void FileOpen(wxCommandEvent& event);
     void FileOpen2(wxCommandEvent& event);
     void FilesOpen(wxCommandEvent& event);
     void FileSave(wxCommandEvent& event);

+#endif // wxUSE_FILEDLG
+
+#if USE_FILEDLG_GENERIC
+    void FileOpenGeneric(wxCommandEvent& event);
+    void FilesOpenGeneric(wxCommandEvent& event);
+    void FileSaveGeneric(wxCommandEvent& event);
+#endif // USE_FILEDLG_GENERIC
+
+#if wxUSE_DIRDLG

     void DirChoose(wxCommandEvent& event);
     void DirChoose(wxCommandEvent& event);

+    void DirChooseNew(wxCommandEvent& event);
+#endif // wxUSE_DIRDLG
+
+#if USE_DIRDLG_GENERIC

     void GenericDirChoose(wxCommandEvent& event);
     void GenericDirChoose(wxCommandEvent& event);

+#endif // USE_DIRDLG_GENERIC
+
+#if wxUSE_STARTUP_TIPS

     void ShowTip(wxCommandEvent& event);
     void ShowTip(wxCommandEvent& event);

+#endif // wxUSE_STARTUP_TIPS
+
+#if USE_MODAL_PRESENTATION

     void ModalDlg(wxCommandEvent& event);
     void ModalDlg(wxCommandEvent& event);

+#endif // USE_MODAL_PRESENTATION

     void ModelessDlg(wxCommandEvent& event);
     void ModelessDlg(wxCommandEvent& event);

+    void DlgCenteredScreen(wxCommandEvent& event);
+    void DlgCenteredParent(wxCommandEvent& event);
+    void MiniFrame(wxCommandEvent& event);
+    void DlgOnTop(wxCommandEvent& event);
+

 #if wxUSE_PROGRESSDLG
     void ShowProgress(wxCommandEvent& event);
 #endif // wxUSE_PROGRESSDLG
 #if wxUSE_PROGRESSDLG
     void ShowProgress(wxCommandEvent& event);
 #endif // wxUSE_PROGRESSDLG

+
+#if wxUSE_ABOUTDLG
+    void ShowSimpleAboutDialog(wxCommandEvent& event);
+    void ShowFancyAboutDialog(wxCommandEvent& event);
+    void ShowFullAboutDialog(wxCommandEvent& event);
+    void ShowCustomAboutDialog(wxCommandEvent& event);
+#endif // wxUSE_ABOUTDLG
+
+#if wxUSE_BUSYINFO
+    void ShowBusyInfo(wxCommandEvent& event);
+#endif // wxUSE_BUSYINFO
+

 #if wxUSE_FINDREPLDLG
     void ShowFindDialog(wxCommandEvent& event);
     void ShowReplaceDialog(wxCommandEvent& event);
 #if wxUSE_FINDREPLDLG
     void ShowFindDialog(wxCommandEvent& event);
     void ShowReplaceDialog(wxCommandEvent& event);

-

     void OnFindDialog(wxFindDialogEvent& event);
 #endif // wxUSE_FINDREPLDLG
 
     void OnFindDialog(wxFindDialogEvent& event);
 #endif // wxUSE_FINDREPLDLG
 

-#if !defined(__WXMSW__) || wxTEST_GENERIC_DIALOGS_IN_MSW
+#if USE_COLOURDLG_GENERIC

     void ChooseColourGeneric(wxCommandEvent& event);
     void ChooseColourGeneric(wxCommandEvent& event);

+#endif // USE_COLOURDLG_GENERIC
+
+#if USE_FONTDLG_GENERIC

     void ChooseFontGeneric(wxCommandEvent& event);
     void ChooseFontGeneric(wxCommandEvent& event);

-#endif
+#endif // USE_FONTDLG_GENERIC
+
+    void OnPropertySheet(wxCommandEvent& event);
+
+    void OnRequestUserAttention(wxCommandEvent& event);
+#if wxUSE_NOTIFICATION_MESSAGE
+    void OnNotifMsgAuto(wxCommandEvent& event);
+    void OnNotifMsgShow(wxCommandEvent& event);
+    void OnNotifMsgHide(wxCommandEvent& event);
+#endif // wxUSE_NOTIFICATION_MESSAGE
+
+#if wxUSE_RICHTOOLTIP
+    void OnRichTipDialog(wxCommandEvent& event);
+#endif // wxUSE_RICHTOOLTIP
+
+    void OnStandardButtonsSizerDialog(wxCommandEvent& event);
+
+    void OnTestDefaultActionDialog(wxCommandEvent& event);
+    void OnModalHook(wxCommandEvent& event);

 
     void OnExit(wxCommandEvent& event);
 
 private:
 
     void OnExit(wxCommandEvent& event);
 
 private:

+#if wxUSE_DIRDLG
+    void DoDirChoose(int style);
+#endif // wxUSE_DIRDLG
+
+#if USE_MODAL_PRESENTATION

     MyModelessDialog *m_dialog;
     MyModelessDialog *m_dialog;

+#endif // USE_MODAL_PRESENTATION

 
 #if wxUSE_FINDREPLDLG
     wxFindReplaceData m_findData;
 
 #if wxUSE_FINDREPLDLG
     wxFindReplaceData m_findData;

+
+    wxFindReplaceDialog *m_dlgFind,
+                        *m_dlgReplace;

 #endif // wxUSE_FINDREPLDLG
 
 #endif // wxUSE_FINDREPLDLG
 

+#if wxUSE_NOTIFICATION_MESSAGE
+    wxNotificationMessage *m_notifMsg;
+#endif // wxUSE_NOTIFICATION_MESSAGE
+
+    wxColourData m_clrData;
+
+    // just a window which we use to show the effect of font/colours selection
+    wxWindow *m_canvas;
+
+#if wxUSE_INFOBAR
+    void OnInfoBarRedo(wxCommandEvent& event);
+
+    wxInfoBar *m_infoBarSimple,
+              *m_infoBarAdvanced;
+#endif // wxUSE_INFOBAR
+

     DECLARE_EVENT_TABLE()
 };
 
 class MyCanvas: public wxScrolledWindow
 {
 public:
     DECLARE_EVENT_TABLE()
 };
 
 class MyCanvas: public wxScrolledWindow
 {
 public:

-    MyCanvas(wxWindow *parent) : wxScrolledWindow(parent) { }
+    MyCanvas(wxWindow *parent) : wxScrolledWindow(parent, wxID_ANY)
+    {
+        SetForegroundColour(*wxBLACK);
+        SetBackgroundColour(*wxWHITE);
+        SetFont(*wxNORMAL_FONT);
+    }

 
 

+private:

     void OnPaint(wxPaintEvent& event);
 
     DECLARE_EVENT_TABLE()
     void OnPaint(wxPaintEvent& event);
 
     DECLARE_EVENT_TABLE()


@@ -116,30 +534,63 @@ public:
 // Menu IDs
 enum
 {
 // Menu IDs
 enum
 {

-    DIALOGS_CHOOSE_COLOUR = 1,
+    DIALOGS_CHOOSE_COLOUR = wxID_HIGHEST,
+    DIALOGS_GET_COLOUR,

     DIALOGS_CHOOSE_COLOUR_GENERIC,
     DIALOGS_CHOOSE_FONT,
     DIALOGS_CHOOSE_FONT_GENERIC,
     DIALOGS_MESSAGE_BOX,
     DIALOGS_CHOOSE_COLOUR_GENERIC,
     DIALOGS_CHOOSE_FONT,
     DIALOGS_CHOOSE_FONT_GENERIC,
     DIALOGS_MESSAGE_BOX,

+    DIALOGS_MESSAGE_BOX_WINDOW_MODAL,
+    DIALOGS_MESSAGE_DIALOG,
+    DIALOGS_MESSAGE_BOX_WXINFO,
+    DIALOGS_RICH_MESSAGE_DIALOG,

     DIALOGS_SINGLE_CHOICE,
     DIALOGS_MULTI_CHOICE,
     DIALOGS_SINGLE_CHOICE,
     DIALOGS_MULTI_CHOICE,

+    DIALOGS_REARRANGE,
+    DIALOGS_LINE_ENTRY,

     DIALOGS_TEXT_ENTRY,
     DIALOGS_PASSWORD_ENTRY,
     DIALOGS_FILE_OPEN,
     DIALOGS_FILE_OPEN2,
     DIALOGS_FILES_OPEN,
     DIALOGS_FILE_SAVE,
     DIALOGS_TEXT_ENTRY,
     DIALOGS_PASSWORD_ENTRY,
     DIALOGS_FILE_OPEN,
     DIALOGS_FILE_OPEN2,
     DIALOGS_FILES_OPEN,
     DIALOGS_FILE_SAVE,

+    DIALOGS_FILE_OPEN_GENERIC,
+    DIALOGS_FILES_OPEN_GENERIC,
+    DIALOGS_FILE_SAVE_GENERIC,

     DIALOGS_DIR_CHOOSE,
     DIALOGS_DIR_CHOOSE,

+    DIALOGS_DIRNEW_CHOOSE,

     DIALOGS_GENERIC_DIR_CHOOSE,
     DIALOGS_TIP,
     DIALOGS_NUM_ENTRY,
     DIALOGS_LOG_DIALOG,
     DIALOGS_GENERIC_DIR_CHOOSE,
     DIALOGS_TIP,
     DIALOGS_NUM_ENTRY,
     DIALOGS_LOG_DIALOG,

+    DIALOGS_INFOBAR_SIMPLE,
+    DIALOGS_INFOBAR_ADVANCED,

     DIALOGS_MODAL,
     DIALOGS_MODELESS,
     DIALOGS_MODAL,
     DIALOGS_MODELESS,

+    DIALOGS_CENTRE_SCREEN,
+    DIALOGS_CENTRE_PARENT,
+    DIALOGS_MINIFRAME,
+    DIALOGS_ONTOP,

     DIALOGS_MODELESS_BTN,
     DIALOGS_PROGRESS,
     DIALOGS_MODELESS_BTN,
     DIALOGS_PROGRESS,

+    DIALOGS_ABOUTDLG_SIMPLE,
+    DIALOGS_ABOUTDLG_FANCY,
+    DIALOGS_ABOUTDLG_FULL,
+    DIALOGS_ABOUTDLG_CUSTOM,
+    DIALOGS_BUSYINFO,

     DIALOGS_FIND,
     DIALOGS_FIND,

-    DIALOGS_REPLACE
+    DIALOGS_REPLACE,
+    DIALOGS_REQUEST,
+    DIALOGS_NOTIFY_AUTO,
+    DIALOGS_NOTIFY_SHOW,
+    DIALOGS_NOTIFY_HIDE,
+    DIALOGS_RICHTIP_DIALOG,
+    DIALOGS_PROPERTY_SHEET,
+    DIALOGS_PROPERTY_SHEET_TOOLBOOK,
+    DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK,
+    DIALOGS_STANDARD_BUTTON_SIZER_DIALOG,
+    DIALOGS_TEST_DEFAULT_ACTION,
+    DIALOGS_MODAL_HOOK

 };
 
 #endif
 };
 
 #endif