Applied modified #10655 (Added Cookie (receive) support to wxHTTP)

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index be410c27130f3e335e10c8aeb17ee4fbe06f6d50..708b4b9aa722386a70bda1764f5b96b3416fbc34 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -2530,7 +2530,9 @@ typedef enum
     wxPAPER_PENV_7_ROTATED,     /* PRC Envelope #7 Rotated 230 x 160 mm */
     wxPAPER_PENV_8_ROTATED,     /* PRC Envelope #8 Rotated 309 x 120 mm */
     wxPAPER_PENV_9_ROTATED,     /* PRC Envelope #9 Rotated 324 x 229 mm */
     wxPAPER_PENV_7_ROTATED,     /* PRC Envelope #7 Rotated 230 x 160 mm */
     wxPAPER_PENV_8_ROTATED,     /* PRC Envelope #8 Rotated 309 x 120 mm */
     wxPAPER_PENV_9_ROTATED,     /* PRC Envelope #9 Rotated 324 x 229 mm */

-    wxPAPER_PENV_10_ROTATED    /* PRC Envelope #10 Rotated 458 x 324 m */
+    wxPAPER_PENV_10_ROTATED,    /* PRC Envelope #10 Rotated 458 x 324 m */
+    wxPAPER_A0,                 /* A0 Sheet 841 x 1189 mm */
+    wxPAPER_A1                  /* A1 Sheet 594 x 841 mm */

 } wxPaperSize;
 
 /* Printing orientation */
 } wxPaperSize;
 
 /* Printing orientation */


@@ -2838,9 +2840,12 @@ DECLARE_WXCOCOA_OBJC_CLASS(UIFont);
 DECLARE_WXCOCOA_OBJC_CLASS(UIImage);
 DECLARE_WXCOCOA_OBJC_CLASS(UIEvent);
 DECLARE_WXCOCOA_OBJC_CLASS(NSSet);
 DECLARE_WXCOCOA_OBJC_CLASS(UIImage);
 DECLARE_WXCOCOA_OBJC_CLASS(UIEvent);
 DECLARE_WXCOCOA_OBJC_CLASS(NSSet);

+DECLARE_WXCOCOA_OBJC_CLASS(EAGLContext);

 
 typedef WX_UIWindow WXWindow;
 typedef WX_UIView WXWidget;
 
 typedef WX_UIWindow WXWindow;
 typedef WX_UIView WXWidget;

+typedef WX_EAGLContext WXGLContext;
+typedef WX_NSString* WXGLPixelFormat;

 
 #endif
 
 
 #endif