X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b02d42e37a2fc25e16644e5276ac3df22cd1690..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/msw/msgdlg.h

diff --git a/include/wx/msw/msgdlg.h b/include/wx/msw/msgdlg.h
index 1ed42ae17d..6b2f11004b 100644
--- a/include/wx/msw/msgdlg.h
+++ b/include/wx/msw/msgdlg.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 
-class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogWithCustomLabels
+class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase
 {
 public:
     wxMessageDialog(wxWindow *parent,
@@ -20,18 +20,24 @@ public:
                     const wxString& caption = wxMessageBoxCaptionStr,
                     long style = wxOK|wxCENTRE,
                     const wxPoint& WXUNUSED(pos) = wxDefaultPosition)
-        : wxMessageDialogWithCustomLabels(parent, message, caption, style)
+        : wxMessageDialogBase(parent, message, caption, style)
     {
         m_hook = NULL;
     }
 
     virtual int ShowModal();
 
+    virtual long GetEffectiveIcon() const;
+
     // implementation-specific
 
     // return the font used for the text in the message box
     static wxFont GetMessageFont();
 
+protected:
+    // Override this as task dialogs are always centered on parent.
+    virtual void DoCentre(int dir);
+
 private:
     // hook procedure used to adjust the message box beyond what the standard
     // MessageBox() function can do for us
@@ -55,11 +61,14 @@ private:
     // offset all buttons starting from the first one given by dx to the right
     void OffsetButtonsStartingFrom(int first, int dx);
 
+    // used by ShowModal() to display a message box when task dialogs
+    // aren't available.
+    int ShowMessageBox();
+
 
     WXHANDLE m_hook; // HHOOK used to position the message box
 
-    DECLARE_DYNAMIC_CLASS(wxMessageDialog)
-    DECLARE_NO_COPY_CLASS(wxMessageDialog)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMessageDialog);
 };