don't use a floating point value as a boolean flag; gcc4 (correctly) complains when...

[wxWidgets.git] / include / wx / dialog.h

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 8d054b7fa12a55549852e85b6dfcfc994acaa7cf..7df4f1f9a1dc5ed246b28910b93bc86578449adc 100644 (file)
--- 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"
@@ -51,17 +47,8 @@ public:
     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
@@ -82,6 +69,9 @@ protected:
     // The identifier for the affirmative button (usually wxID_OK)
     int m_affirmativeId;
 
+    // The identifier for cancel button (usually wxID_CANCEL)
+    int m_escapeId;
+
     DECLARE_NO_COPY_CLASS(wxDialogBase)
     DECLARE_EVENT_TABLE()
     WX_DECLARE_CONTROL_CONTAINER();