Rebake from clean wx tree.

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

diff --git a/include/wx/msw/msgdlg.h b/include/wx/msw/msgdlg.h
index 29ae1be0b38638d984d0539531a5a1010caa1a6e..8fd4d7a4e38be85038d3ba363485cdb832956c11 100644 (file)
--- a/include/wx/msw/msgdlg.h
+++ b/include/wx/msw/msgdlg.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 

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

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


@@ -20,21 +20,46 @@ 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)

-        : wxMessageDialogBase(parent, message, caption, style)
+        : wxMessageDialogWithCustomLabels(parent, message, caption, style)

     {
         m_hook = NULL;
     }
 
     {
         m_hook = NULL;
     }
 

-

     virtual int ShowModal();
 
     virtual int ShowModal();
 

+    // implementation-specific
+
+    // return the font used for the text in the message box
+    static wxFont GetMessageFont();
+

 private:
 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 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();
+
+    // offset all buttons starting from the first one given by dx to the right
+    void OffsetButtonsStartingFrom(int first, int dx);
+
+

     WXHANDLE m_hook; // HHOOK used to position the message box
 
     DECLARE_DYNAMIC_CLASS(wxMessageDialog)
     WXHANDLE m_hook; // HHOOK used to position the message box
 
     DECLARE_DYNAMIC_CLASS(wxMessageDialog)

-    DECLARE_NO_COPY_CLASS(wxMessageDialog)
+    wxDECLARE_NO_COPY_CLASS(wxMessageDialog);

 };
 
 
 };