added missing #include <wx/defs.h> (parts of patch 649438)

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

diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h
index da9d0382f1b480521ebebc414abd421fd6033669..65f3ed28f44f7ffd45176d95ec4b8b4651c9055d 100644 (file)
--- a/include/wx/motif/dialog.h
+++ b/include/wx/motif/dialog.h
@@ -12,67 +12,63 @@
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 

-#ifdef __GNUG__
-    #pragma interface "dialog.h"
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "dialog.h"

 #endif
 
 #endif
 

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

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

-DECLARE_DYNAMIC_CLASS(wxDialog)
+    DECLARE_DYNAMIC_CLASS(wxDialog)

 
 public:
     wxDialog();
 
 
 public:
     wxDialog();
 

+#if WXWIN_COMPATIBILITY_2

     // Constructor with a modal flag, but no window id - the old convention
     wxDialog(wxWindow *parent,
     // 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)
+        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);
     }
     {
         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,
 
     // Constructor with no modal flag - the new convention.
     wxDialog(wxWindow *parent, wxWindowID id,

-            const wxString& title,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = wxDEFAULT_DIALOG_STYLE,
-            const wxString& name = wxDialogNameStr)
+        const wxString& title,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = wxDEFAULT_DIALOG_STYLE,
+        const wxString& name = wxDialogNameStr)

     {
         Create(parent, id, title, pos, size, style, name);
     }
 
     bool Create(wxWindow *parent, wxWindowID id,
     {
         Create(parent, id, title, pos, size, style, name);
     }
 
     bool Create(wxWindow *parent, wxWindowID id,

-            const wxString& title, // bool modal = FALSE, // TODO make this a window style?
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = wxDEFAULT_DIALOG_STYLE,
-            const wxString& name = wxDialogNameStr);
+        const wxString& title, // bool modal = FALSE, // TODO make this a window style?
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = wxDEFAULT_DIALOG_STYLE,
+        const wxString& name = wxDialogNameStr);

 
     ~wxDialog();
 
     virtual bool Destroy();
 
 
     ~wxDialog();
 
     virtual bool Destroy();
 

-    bool Show(bool show);
-    void Iconize(bool iconize);
-    void Raise();
-    void Lower();
-
-    virtual bool IsIconized() const;
+    virtual bool Show(bool show = TRUE);

 
     void SetTitle(const wxString& title);
 
     void SetTitle(const wxString& title);

-    wxString GetTitle() const ;

 
     void SetModal(bool flag);
 
     virtual bool IsModal() const
 
     void SetModal(bool flag);
 
     virtual bool IsModal() const

-        { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
+    { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }

 
     virtual int ShowModal();
     virtual void EndModal(int retCode);
 
     virtual int ShowModal();
     virtual void EndModal(int retCode);


@@ -89,24 +85,29 @@ public:
     void OnApply(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);
 
     void OnApply(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);
 

-    void OnPaint(wxPaintEvent &event);
-

     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 

-    //  bool OnClose();

     void OnCharHook(wxKeyEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
 
     void OnCharHook(wxKeyEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
 

-public:
+private:
+    virtual bool DoCreate( wxWindow* parent, wxWindowID id,
+                           const wxString& title,
+                           const wxPoint& pos,
+                           const wxSize& size,
+                           long style,
+                           const wxString& name );
+    virtual void DoDestroy();
+

     //// Motif-specific
     bool          m_modalShowing;
     //// Motif-specific
     bool          m_modalShowing;

-    wxString      m_dialogTitle;
+    wxEventLoop*  m_eventLoop;

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

-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
+        int width, int height,
+        int sizeFlags = wxSIZE_AUTO);

 
     virtual void DoSetClientSize(int width, int height);
 
 
     virtual void DoSetClientSize(int width, int height);
 


@@ -115,4 +116,4 @@ private:
 };
 
 #endif
 };
 
 #endif

-    // _WX_DIALOG_H_
+// _WX_DIALOG_H_