X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16cba29d3a5a0a95b367382311a4a7a9a9833210..b7972e1fa8a66f67262edff466416f6a5bedc48c:/include/wx/dialog.h

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index ec8bfb2cec..8d054b7fa1 100644
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -26,13 +26,9 @@ class WXDLLEXPORT wxStdDialogButtonSizer;
 #define wxDIALOG_NO_PARENT      0x0001  // Don't make owned by apps top window
 
 #ifdef __WXWINCE__
-#   ifdef __SMARTPHONE__
-#       define wxDEFAULT_DIALOG_STYLE (wxMAXIMIZE | wxCAPTION)
-#   else
-#       define wxDEFAULT_DIALOG_STYLE (0)
-#   endif
-#else // !__WXWINCE__
-#   define wxDEFAULT_DIALOG_STYLE  (wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX)
+#define wxDEFAULT_DIALOG_STYLE  (wxCAPTION | wxMAXIMIZE | wxCLOSE_BOX | wxNO_BORDER)
+#else
+#define wxDEFAULT_DIALOG_STYLE  (wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX)
 #endif
 
 extern WXDLLEXPORT_DATA(const wxChar*) wxDialogNameStr;
@@ -45,11 +41,28 @@ public:
 
     void Init();
 
-    // the modal dialogs have a return code - usually the id of the last
+    // Modal dialogs have a return code - usually the id of the last
     // pressed button
     void SetReturnCode(int returnCode) { m_returnCode = returnCode; }
     int GetReturnCode() const { return m_returnCode; }
 
+    // The identifier for the affirmative button
+    void SetAffirmativeId(int affirmativeId) { m_affirmativeId = affirmativeId; }
+    int GetAffirmativeId() const { return m_affirmativeId; }
+
+    // Identifier for Esc key translation
+#if wxCHECK_VERSION(2, 7, 0)
+    #error "Uncomment SetEscapeId() implementation"
+
+    // this is what we should do in 2.7: remove the "#else" part and add
+    // m_escapeId declaration and the docs for Set/GetEscapeId()
+    void SetEscapeId(int escapeId) { m_escapeId = escapeId; }
+    int GetEscapeId() const { return m_escapeId; }
+#elif wxABI_VERSION > 20601
+    // just a stub for 2.6
+    int GetEscapeId() const { return wxID_ANY; }
+#endif
+
 #if wxUSE_STATTEXT // && wxUSE_TEXTCTRL
     // splits text up at newlines and places the
     // lines into a vertical wxBoxSizer
@@ -63,9 +76,12 @@ public:
 #endif // wxUSE_BUTTON
 
 protected:
-    // the return code from modal dialog
+    // The return code from modal dialog
     int m_returnCode;
 
+    // The identifier for the affirmative button (usually wxID_OK)
+    int m_affirmativeId;
+
     DECLARE_NO_COPY_CLASS(wxDialogBase)
     DECLARE_EVENT_TABLE()
     WX_DECLARE_CONTROL_CONTAINER();