define WS_XXX constants missing in (some) CE SDKs

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

diff --git a/include/wx/paper.h b/include/wx/paper.h
index 322e7e002f1f6d0569e15cd4fd77581be4277907..973a73312d6f566f4f8ec1e3c1328650a82f7d3b 100644 (file)
--- a/include/wx/paper.h
+++ b/include/wx/paper.h
@@ -12,7 +12,7 @@
 #ifndef _WX_PAPERH__
 #define _WX_PAPERH__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "paper.h"
 #endif
 
@@ -23,7 +23,7 @@
 
 /*
  * 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.
  */
 
@@ -69,10 +69,14 @@ private:
     DECLARE_DYNAMIC_CLASS(wxPrintPaperType)
 };
 
-class WXDLLEXPORT wxPrintPaperDatabase: public wxList
+class WXDLLEXPORT wxStringToPrintPaperTypeHashMap;
+class WXDLLEXPORT wxPrintPaperTypeList;
+
+class WXDLLEXPORT wxPrintPaperDatabase
 {
 public:
     wxPrintPaperDatabase();
+    ~wxPrintPaperDatabase();
 
     void CreateDatabase();
     void ClearDatabase();
@@ -104,8 +108,13 @@ public:
     // Get the paper size
     wxPaperSize GetSize(const wxSize& size);
 
+    //
+    wxPrintPaperType* Item(size_t index) const;
+    size_t GetCount() const;
 private:
-    DECLARE_DYNAMIC_CLASS(wxPrintPaperDatabase)
+    wxStringToPrintPaperTypeHashMap* m_map;
+    wxPrintPaperTypeList* m_list;
+    // DECLARE_DYNAMIC_CLASS(wxPrintPaperDatabase)
 };
 
 WXDLLEXPORT_DATA(extern wxPrintPaperDatabase*) wxThePrintPaperDatabase;