compilation fix: wxGenericCollapsiblePane needs wxButton and wxStaticLine

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

diff --git a/include/wx/mac/dialog.h b/include/wx/mac/dialog.h
index 1aa01b36f04892859cafc1a9bcd79c9e541f99c7..abc6c003ed99c72585915c297184170f6aff5a61 100644 (file)
--- a/include/wx/mac/dialog.h
+++ b/include/wx/mac/dialog.h
@@ -1,131 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        dialog.h
-// Purpose:     wxDialog class
-// Author:      AUTHOR
-// Modified by:
-// Created:     ??/??/98
-// RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DIALOG_H_
-#define _WX_DIALOG_H_
-
-#ifdef __GNUG__
-#pragma interface "dialog.h"
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/dialog.h"
+#else
+#include "wx/mac/carbon/dialog.h"
 #endif
-
-#include "wx/panel.h"
-
-WXDLLEXPORT_DATA(extern const char*) 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();
-
-    virtual void DoSetClientSize(int width, int height);
-
-    virtual void GetPosition(int *x, int *y) const;
-
-    bool Show(bool show);
-    bool IsShown() const;
-    void Iconize(bool iconize);
-
-#if WXWIN_COMPATIBILITY
-    bool Iconized() const { return IsIconized(); };
-#endif
-
-    virtual bool IsIconized() const;
-    void Fit();
-
-    void SetTitle(const wxString& title);
-    wxString GetTitle() const ;
-
-    void OnSize(wxSizeEvent& event);
-    bool OnClose();
-    void OnCharHook(wxKeyEvent& event);
-    void OnPaint(wxPaintEvent& event);
-    void OnCloseWindow(wxCloseEvent& event);
-
-    void SetModal(bool flag);
-
-    virtual void Centre(int direction = wxBOTH);
-    virtual bool IsModal() const;
-
-    // For now, same as Show(TRUE) but returns return code
-    virtual int ShowModal();
-    virtual void EndModal(int retCode);
-
-    // Standard buttons
-    void OnOK(wxCommandEvent& event);
-    void OnApply(wxCommandEvent& event);
-    void OnCancel(wxCommandEvent& event);
-
-    // Responds to colour changes
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-
-    // implementation
-    // --------------
-
-    bool IsModalShowing() const { return m_modalShowing; }
-
-  // tooltip management
-#if wxUSE_TOOLTIPS
-    wxMacToolTip* GetToolTipCtrl() const { return m_hwndToolTip; }
-    void SetToolTipCtrl(wxMacToolTip *tt) { m_hwndToolTip = tt; }
-    wxMacToolTip* m_hwndToolTip ;
-#endif // tooltips
-
-protected:
-    bool   m_modalShowing;
-    WXHWND m_hwndOldFocus;  // the window which had focus before we were shown
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-#endif
-    // _WX_DIALOG_H_