wxChoicebook generic implementation.

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

diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h
index c8d36d63faaa5b41ae00ca39b713135eb07a7135..1f10207ba852f0e56ba41f07cddcbcdb998050e9 100644 (file)
--- a/include/wx/motif/dialog.h
+++ b/include/wx/motif/dialog.h
@@ -12,11 +12,11 @@
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 

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

 #pragma interface "dialog.h"
 #endif
 
 #pragma interface "dialog.h"
 #endif
 

-WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
+class WXDLLEXPORT wxEventLoop;

 
 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxDialogBase
 
 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxDialogBase


@@ -26,19 +26,6 @@ class WXDLLEXPORT wxDialog : public wxDialogBase
 public:
     wxDialog();
 
 public:
     wxDialog();
 

-#if WXWIN_COMPATIBILITY_2
-    // Constructor with a modal flag, but no window id - the old convention
-    wxDialog(wxWindow *parent,
-        const wxString& title, bool modal,
-        int x = -1, int y= -1, int width = 500, int height = 500,
-        long style = wxDEFAULT_DIALOG_STYLE,
-        const wxString& name = wxDialogNameStr)
-    {
-        long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
-        Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), style|modalStyle, name);
-    }
-#endif
-

     // Constructor with no modal flag - the new convention.
     wxDialog(wxWindow *parent, wxWindowID id,
         const wxString& title,
     // Constructor with no modal flag - the new convention.
     wxDialog(wxWindow *parent, wxWindowID id,
         const wxString& title,


@@ -102,6 +89,7 @@ private:
 
     //// Motif-specific
     bool          m_modalShowing;
 
     //// Motif-specific
     bool          m_modalShowing;

+    wxEventLoop*  m_eventLoop;

 
 protected:
     virtual void DoSetSize(int x, int y,
 
 protected:
     virtual void DoSetSize(int x, int y,