Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / msw / msgdlg.h

diff --git a/include/wx/msw/msgdlg.h b/include/wx/msw/msgdlg.h
index 4ca1be5f418853a9fefeb148c1aac10b7c23f84a..3562a362c3f78735ae38154cf3c8193be99e79ae 100644 (file)
--- a/include/wx/msw/msgdlg.h
+++ b/include/wx/msw/msgdlg.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,7 +11,7 @@
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 

-class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogWithCustomLabels
+class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase

 {
 public:
     wxMessageDialog(wxWindow *parent,
 {
 public:
     wxMessageDialog(wxWindow *parent,


@@ -20,28 +19,55 @@ public:
                     const wxString& caption = wxMessageBoxCaptionStr,
                     long style = wxOK|wxCENTRE,
                     const wxPoint& WXUNUSED(pos) = wxDefaultPosition)
                     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();
 
     {
         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
     static WXLRESULT wxCALLBACK HookFunction(int code, WXWPARAM, WXLPARAM);
 
 private:
     // hook procedure used to adjust the message box beyond what the standard
     // MessageBox() function can do for us
     static WXLRESULT wxCALLBACK HookFunction(int code, WXWPARAM, WXLPARAM);
 

+    static const struct ButtonAccessors
+    {
+        int id;
+        wxString (wxMessageDialog::*getter)() const;
+    } ms_buttons[];
+
+    // replace the static text control with a text control in order to show
+    // scrollbar (and also, incidentally, allow text selection)
+    void ReplaceStaticWithEdit();
+

     // adjust the button labels
     //
     // this is called from HookFunction() and our HWND is valid at this moment
     void AdjustButtonLabels();
 
     // adjust the button labels
     //
     // this is called from HookFunction() and our HWND is valid at this moment
     void AdjustButtonLabels();
 

+    // 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
 
 
     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);

 };
 
 
 };