fixing warning and compile error against 10.4

[wxWidgets.git] / include / wx / generic / msgdlgg.h

diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h
index 9e3bbcff9db18c5f1a4896f0edf4d186ec4095eb..f6583bd3511e7d676381226a732b8e0308e5215b 100644 (file)
--- a/include/wx/generic/msgdlgg.h
+++ b/include/wx/generic/msgdlgg.h
@@ -12,7 +12,9 @@
 #ifndef _WX_GENERIC_MSGDLGG_H_
 #define _WX_GENERIC_MSGDLGG_H_
 
 #ifndef _WX_GENERIC_MSGDLGG_H_
 #define _WX_GENERIC_MSGDLGG_H_
 

-class WXDLLEXPORT wxGenericMessageDialog : public wxMessageDialogBase
+class WXDLLIMPEXP_FWD_CORE wxSizer;
+
+class WXDLLIMPEXP_CORE wxGenericMessageDialog : public wxMessageDialogBase

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


@@ -24,12 +26,24 @@ public:
     virtual int ShowModal();
 
 protected:
     virtual int ShowModal();
 
 protected:

+    // Creates a message dialog taking any options that have been set after
+    // object creation into account such as custom labels.
+    void DoCreateMsgdialog();
+

     void OnYes(wxCommandEvent& event);
     void OnNo(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);
 
     void OnYes(wxCommandEvent& event);
     void OnNo(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);
 

+    // can be overridden to provide more contents to the dialog
+    virtual void AddMessageDialogCheckBox(wxSizer *WXUNUSED(sizer)) { }
+    virtual void AddMessageDialogDetails(wxSizer *WXUNUSED(sizer)) { }
+

 private:
 private:

-    void DoCreateMsgdialog();
+    // Creates and returns a standard button sizer using the style of this
+    // dialog and the custom labels, if any.
+    //
+    // May return NULL on smart phone platforms not using buttons at all.
+    wxSizer *CreateMsgDlgButtonSizer();

 
     wxPoint m_pos;
     bool m_created;
 
     wxPoint m_pos;
     bool m_created;