Fixes so joystick not only compiles on Linux, but it actually works too!

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

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index f13cc11a5fd6a5f30b1748147b5b6a2949273c58..c40e2399a3dc8e0e517f58d433b4756e2b45ee8e 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DIALOG_H_BASE_
 #define _WX_DIALOG_H_BASE_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "dialogbase.h"
 #endif
 
@@ -20,6 +20,14 @@
 #include "wx/containr.h"
 #include "wx/toplevel.h"
 
+#define wxDIALOG_NO_PARENT      0x0001  // Don't make owned by apps top window
+
+#ifdef __WXWINCE__
+    #define wxDEFAULT_DIALOG_STYLE (0)
+#else // !__WXWINCE__
+    #define wxDEFAULT_DIALOG_STYLE  (wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX)
+#endif
+
 WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 
 class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
@@ -50,6 +58,7 @@ protected:
     // the return code from modal dialog
     int m_returnCode;
 
+    DECLARE_NO_COPY_CLASS(wxDialogBase)
     DECLARE_EVENT_TABLE()
     WX_DECLARE_CONTROL_CONTAINER();
 };