include stdlib.h to get malloc/free decl

[wxWidgets.git] / include / wx / paper.h

diff --git a/include/wx/paper.h b/include/wx/paper.h
index 1d9a7bb750b4604177364284df9cce9fc9bf38f2..973a73312d6f566f4f8ec1e3c1328650a82f7d3b 100644 (file)
--- a/include/wx/paper.h
+++ b/include/wx/paper.h
@@ -12,17 +12,18 @@
 #ifndef _WX_PAPERH__
 #define _WX_PAPERH__
 
 #ifndef _WX_PAPERH__
 #define _WX_PAPERH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "paper.h"
 #endif
 
 #include "wx/defs.h"
 #include "wx/event.h"
 #include "wx/cmndata.h"
 #pragma interface "paper.h"
 #endif
 
 #include "wx/defs.h"
 #include "wx/event.h"
 #include "wx/cmndata.h"

+#include "wx/intl.h"

 
 /*
  * Paper type: see defs.h for wxPaperSize enum.
 
 /*
  * Paper type: see defs.h for wxPaperSize enum.

- * A wxPrintePaperType can have an id and a name, or just a name and wxPAPER_NONE,
+ * A wxPrintPaperType can have an id and a name, or just a name and wxPAPER_NONE,

  * so you can add further paper types without needing new ids.
  */
 
  * so you can add further paper types without needing new ids.
  */
 


@@ -40,7 +41,7 @@ public:
     // platformId is a platform-specific id, such as in Windows, DMPAPER_...
     wxPrintPaperType(wxPaperSize paperId, int platformId, const wxString& name, int w, int h);
 
     // platformId is a platform-specific id, such as in Windows, DMPAPER_...
     wxPrintPaperType(wxPaperSize paperId, int platformId, const wxString& name, int w, int h);
 

-    inline const wxString& GetName() const { return m_paperName; }
+    inline wxString GetName() const { return wxGetTranslation(m_paperName); }

     inline wxPaperSize GetId() const { return m_paperId; }
     inline int GetPlatformId() const { return m_platformId; }
 
     inline wxPaperSize GetId() const { return m_paperId; }
     inline int GetPlatformId() const { return m_platformId; }
 


@@ -68,10 +69,14 @@ private:
     DECLARE_DYNAMIC_CLASS(wxPrintPaperType)
 };
 
     DECLARE_DYNAMIC_CLASS(wxPrintPaperType)
 };
 

-class WXDLLEXPORT wxPrintPaperDatabase: public wxList
+class WXDLLEXPORT wxStringToPrintPaperTypeHashMap;
+class WXDLLEXPORT wxPrintPaperTypeList;
+
+class WXDLLEXPORT wxPrintPaperDatabase

 {
 public:
     wxPrintPaperDatabase();
 {
 public:
     wxPrintPaperDatabase();

+    ~wxPrintPaperDatabase();

 
     void CreateDatabase();
     void ClearDatabase();
 
     void CreateDatabase();
     void ClearDatabase();


@@ -103,8 +108,13 @@ public:
     // Get the paper size
     wxPaperSize GetSize(const wxSize& size);
 
     // Get the paper size
     wxPaperSize GetSize(const wxSize& size);
 

+    //
+    wxPrintPaperType* Item(size_t index) const;
+    size_t GetCount() const;

 private:
 private:

-    DECLARE_DYNAMIC_CLASS(wxPrintPaperDatabase)
+    wxStringToPrintPaperTypeHashMap* m_map;
+    wxPrintPaperTypeList* m_list;
+    // DECLARE_DYNAMIC_CLASS(wxPrintPaperDatabase)

 };
 
 WXDLLEXPORT_DATA(extern wxPrintPaperDatabase*) wxThePrintPaperDatabase;
 };
 
 WXDLLEXPORT_DATA(extern wxPrintPaperDatabase*) wxThePrintPaperDatabase;