fix the wrong #ifdef WXWIN_COMPATIBILITY_2_8 checks, #if should be used (#9644)

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

diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h
index 0e3b7980f624ee2b702ba4ea5dfb1cba96be3372..a0a3247b9f39ffa04942ecb68852d6b0b1b8fedc 100644 (file)
--- a/include/wx/motif/dialog.h
+++ b/include/wx/motif/dialog.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dialog.h
+// Name:        wx/motif/dialog.h

 // Purpose:     wxDialog class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxDialog class
 // Author:      Julian Smart
 // Modified by:


@@ -12,36 +12,14 @@
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 

-#ifdef __GNUG__
-#pragma interface "dialog.h"
-#endif
-
-WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
-
-class WXDLLEXPORT wxEventLoop;
+class WXDLLIMPEXP_FWD_CORE wxEventLoop;

 
 // Dialog boxes
 
 // Dialog boxes

-class WXDLLEXPORT wxDialog : public wxDialogBase
+class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase

 {
 {

-    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,
-        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,
         const wxPoint& pos = wxDefaultPosition,
     wxDialog(wxWindow *parent, wxWindowID id,
         const wxString& title,
         const wxPoint& pos = wxDefaultPosition,


@@ -53,54 +31,44 @@ public:
     }
 
     bool Create(wxWindow *parent, wxWindowID id,
     }
 
     bool Create(wxWindow *parent, wxWindowID id,

-        const wxString& title, // bool modal = FALSE, // TODO make this a window style?
+        const wxString& title,

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

-    ~wxDialog();
+    virtual ~wxDialog();

 
     virtual bool Destroy();
 
 
     virtual bool Destroy();
 

-    virtual bool Show(bool show = TRUE);
+    virtual bool Show(bool show = true);

 
     void SetTitle(const wxString& title);
 
     void SetModal(bool flag);
 
     virtual bool IsModal() const
 
     void SetTitle(const wxString& title);
 
     void SetModal(bool flag);
 
     virtual bool IsModal() const

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

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

-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
+    virtual void ChangeFont(bool keepOriginalSize = true);

     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();

-    inline WXWidget GetTopWidget() const { return m_mainWidget; }
-    inline WXWidget GetClientWidget() const { return m_mainWidget; }
-
-    // Standard buttons
-    void OnOK(wxCommandEvent& event);
-    void OnApply(wxCommandEvent& event);
-    void OnCancel(wxCommandEvent& event);
-
-    // Responds to colour changes
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-
-    void OnCharHook(wxKeyEvent& event);
-    void OnCloseWindow(wxCloseEvent& event);
+    WXWidget GetTopWidget() const { return m_mainWidget; }
+    WXWidget GetClientWidget() const { return m_mainWidget; }

 
 private:
 
 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();
+    virtual bool XmDoCreateTLW(wxWindow* parent,
+                               wxWindowID id,
+                               const wxString& title,
+                               const wxPoint& pos,
+                               const wxSize& size,
+                               long style,
+                               const wxString& name);
+

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


@@ -108,14 +76,14 @@ private:
 
 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);
 

+

 private:
 private:

-    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxDialog)

 };
 
 };
 

-#endif
-// _WX_DIALOG_H_
+#endif // _WX_DIALOG_H_