Fixed bug #1022383: 'several ComboBoxes appear selected'

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

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 78e89ce307f63006304cc34859eafa9a75b007be..40111edb24c15ac5122149e6604880ee4a5335ff 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -12,47 +12,87 @@
 #ifndef _WX_DIALOG_H_BASE_
 #define _WX_DIALOG_H_BASE_
 
 #ifndef _WX_DIALOG_H_BASE_
 #define _WX_DIALOG_H_BASE_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "dialogbase.h"
 #endif
 
 #include "wx/defs.h"
     #pragma interface "dialogbase.h"
 #endif
 
 #include "wx/defs.h"

-#include "wx/panel.h"
+#include "wx/containr.h"
+#include "wx/toplevel.h"

 
 

-class WXDLLEXPORT wxDialogBase : public wxPanel
+class WXDLLEXPORT wxSizer;
+class WXDLLEXPORT wxStdDialogButtonSizer;
+
+#define wxDIALOG_NO_PARENT      0x0001  // Don't make owned by apps top window
+
+#ifdef __WXWINCE__
+#define wxDEFAULT_DIALOG_STYLE  (wxCAPTION | wxMAXIMIZE | wxCLOSE_BOX)
+#else
+#define wxDEFAULT_DIALOG_STYLE  (wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX)
+#endif
+
+extern WXDLLEXPORT_DATA(const wxChar*) wxDialogNameStr;
+
+class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow

 {
 public:
 {
 public:

-    // the modal dialogs have a return code - usually the id of the last
+    wxDialogBase() { Init(); }
+    virtual ~wxDialogBase() { }
+
+    void Init();
+
+    // 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; }
 
     // 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; }
+
+#if wxUSE_STATTEXT // && wxUSE_TEXTCTRL

     // splits text up at newlines and places the
     // lines into a vertical wxBoxSizer
     wxSizer *CreateTextSizer( const wxString &message );
     // splits text up at newlines and places the
     // lines into a vertical wxBoxSizer
     wxSizer *CreateTextSizer( const wxString &message );

-    
+#endif // wxUSE_STATTEXT // && wxUSE_TEXTCTRL
+
+#if wxUSE_BUTTON

     // places buttons into a horizontal wxBoxSizer
     wxSizer *CreateButtonSizer( long flags );
     // places buttons into a horizontal wxBoxSizer
     wxSizer *CreateButtonSizer( long flags );

+    wxStdDialogButtonSizer *CreateStdDialogButtonSizer( long flags );
+#endif // wxUSE_BUTTON

 
 protected:
 
 protected:

-    // the return code from modal dialog
+    // The return code from modal dialog

     int m_returnCode;
     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();

 };
 
 };
 

-#if defined(__WXMSW__)
-    #include "wx/msw/dialog.h"
-#elif defined(__WXMOTIF__)
-    #include "wx/motif/dialog.h"
-#elif defined(__WXGTK__)
-    #include "wx/gtk/dialog.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/dialog.h"
-#elif defined(__WXMAC__)
-    #include "wx/mac/dialog.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/dialog.h"
-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/dialog.h"
+
+#if defined(__WXUNIVERSAL__) && !defined(__WXMICROWIN__)
+    #include "wx/univ/dialog.h"
+#else
+    #if defined(__WXPALMOS__)
+        #include "wx/palmos/dialog.h"
+    #elif defined(__WXMSW__)
+        #include "wx/msw/dialog.h"
+    #elif defined(__WXMOTIF__)
+        #include "wx/motif/dialog.h"
+    #elif defined(__WXGTK__)
+        #include "wx/gtk/dialog.h"
+    #elif defined(__WXMAC__)
+        #include "wx/mac/dialog.h"
+    #elif defined(__WXCOCOA__)
+        #include "wx/cocoa/dialog.h"
+    #elif defined(__WXPM__)
+        #include "wx/os2/dialog.h"
+    #endif

 #endif
 
 #endif
 #endif
 
 #endif