Wrap <commdlgs.h> as <commctls.h>. Required makefiles rebuilded.

[wxWidgets.git] / include / wx / mac / carbon / fontdlg.h

diff --git a/include/wx/mac/carbon/fontdlg.h b/include/wx/mac/carbon/fontdlg.h
index 3d654b56c8aa3556ec5b96ff10934caa0bbba410..f8aa3f90166b0562f7cd1fc2e6ffd4e7c8c31fd5 100644 (file)
--- a/include/wx/mac/carbon/fontdlg.h
+++ b/include/wx/mac/carbon/fontdlg.h
@@ -1,12 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        fontdlg.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        fontdlg.h

-// Purpose:     wxFontDialog class. Use generic version if no
-//              platform-specific implementation.
-// Author:      Stefan Csomor
+// Purpose:     wxFontDialog class using fonts window services (10.2+). 
+// Author:      Ryan Norton

 // Modified by:
 // Modified by:

-// Created:     1998-01-01
+// Created:     2004-09-25

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) Stefan Csomor
+// Copyright:   (c) Ryan Norton

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -27,18 +26,24 @@
 class WXDLLEXPORT wxFontDialog: public wxDialog
 {
 DECLARE_DYNAMIC_CLASS(wxFontDialog)
 class WXDLLEXPORT wxFontDialog: public wxDialog
 {
 DECLARE_DYNAMIC_CLASS(wxFontDialog)

+

 public:
     wxFontDialog();
     wxFontDialog(wxWindow *parent, const wxFontData& data);
 public:
     wxFontDialog();
     wxFontDialog(wxWindow *parent, const wxFontData& data);

+    ~wxFontDialog();

 
     bool Create(wxWindow *parent, const wxFontData& data);
 
     int ShowModal();
     wxFontData& GetFontData() { return m_fontData; }
 
     bool Create(wxWindow *parent, const wxFontData& data);
 
     int ShowModal();
     wxFontData& GetFontData() { return m_fontData; }

+    bool IsShown() const;
+    void OnPanelClose();
+    void SetData(wxFontData& data);

 
 protected:
     wxWindow*   m_dialogParent;
     wxFontData  m_fontData;
 
 protected:
     wxWindow*   m_dialogParent;
     wxFontData  m_fontData;

+    void*              m_pEventHandlerRef;

 };
 
 #endif
 };
 
 #endif