Applied patch [ 1166587 ] [wxMSW] Removes all flicker from wxStaticBox

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

diff --git a/include/wx/mac/dialog.h b/include/wx/mac/dialog.h
index 24a6464f5d69a686b297331643471342b70df429..abc6c003ed99c72585915c297184170f6aff5a61 100644 (file)
--- a/include/wx/mac/dialog.h
+++ b/include/wx/mac/dialog.h
@@ -1,109 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        dialog.h
-// Purpose:     wxDialog class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// RCS-ID:      $Id$
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DIALOG_H_
-#define _WX_DIALOG_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "dialog.h"
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/dialog.h"
+#else
+#include "wx/mac/carbon/dialog.h"

 #endif
 #endif

-
-#include "wx/panel.h"
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
-
-class WXDLLEXPORT wxMacToolTip ;
-
-// Dialog boxes
-class WXDLLEXPORT wxDialog : public wxDialogBase
-{
-    DECLARE_DYNAMIC_CLASS(wxDialog)
-
-public:
-    wxDialog();
-
-    // 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);
-    }
-
-    // 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)
-    {
-        Create(parent, id, title, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_DIALOG_STYLE,
-                const wxString& name = wxDialogNameStr);
-
-    ~wxDialog();
-
-//    virtual bool Destroy();
-    bool Show(bool show = true);
-
-    void SetModal(bool flag);
-    virtual bool IsModal() const;
-
-    // For now, same as Show(TRUE) but returns return code
-    virtual int ShowModal();
-
-    // may be called to terminate the dialog with the given return code
-    virtual void EndModal(int retCode);
-
-    // returns TRUE if we're in a modal loop
-    bool IsModalShowing() const;
-
-#if WXWIN_COMPATIBILITY
-    bool Iconized() const { return IsIconized(); };
-#endif
-
-    // implementation
-    // --------------
-
-    // event handlers
-    void OnCharHook(wxKeyEvent& event);
-    void OnCloseWindow(wxCloseEvent& event);
-
-    // Standard buttons
-    void OnOK(wxCommandEvent& event);
-    void OnApply(wxCommandEvent& event);
-    void OnCancel(wxCommandEvent& event);
-
-    // Responds to colour changes
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-
-    // show modal dialog and enter modal loop
-    void DoShowModal();
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-#endif
-    // _WX_DIALOG_H_