X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30dfe2ff149185932b79d14acda4b216aa87d2a7..259c43f679ca655362b5a439e11c87fc0666d663:/include/wx/dialog.h diff --git a/include/wx/dialog.h b/include/wx/dialog.h index 7564636c38..ac1e23f9cc 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -12,10 +12,6 @@ #ifndef _WX_DIALOG_H_BASE_ #define _WX_DIALOG_H_BASE_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "dialogbase.h" -#endif - #include "wx/defs.h" #include "wx/containr.h" #include "wx/toplevel.h" @@ -50,6 +46,19 @@ public: 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