FIx broken or missing interface items for Phoenix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

interface/wx/button.h

@@ -6,6 +6,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#define wxBU_LEFT            0x0040
+#define wxBU_TOP             0x0080
+#define wxBU_RIGHT           0x0100
+#define wxBU_BOTTOM          0x0200
+#define wxBU_ALIGN_MASK      ( wxBU_LEFT | wxBU_TOP | wxBU_RIGHT | wxBU_BOTTOM )
 
 #define wxBU_EXACTFIT        0x0001
 #define wxBU_NOTEXT          0x0002

interface/wx/checkbox.h

@@ -6,6 +6,28 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+/*
+ * wxCheckBox style flags
+ * (Using wxCHK_* because wxCB_* is used by wxComboBox).
+ * Determine whether to use a 3-state or 2-state
+ * checkbox. 3-state enables to differentiate
+ * between 'unchecked', 'checked' and 'undetermined'.
+ *
+ * In addition to the styles here it is also possible to specify just 0 which
+ * is treated the same as wxCHK_2STATE for compatibility (but using explicit
+ * flag is preferred).
+ */
+#define wxCHK_2STATE           0x4000
+#define wxCHK_3STATE           0x1000
+
+/*
+ * If this style is set the user can set the checkbox to the
+ * undetermined state. If not set the undetermined set can only
+ * be set programmatically.
+ * This style can only be used with 3 state checkboxes.
+ */
+#define wxCHK_ALLOW_3RD_STATE_FOR_USER 0x2000
+
 /**
     The possible states of a 3-state wxCheckBox (Compatible with the 2-state
     wxCheckBox).
@@ -106,7 +128,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& = wxCheckBoxNameStr);
+                const wxString& name = wxCheckBoxNameStr);
 
     /**
         Gets the state of a 2-state checkbox.

interface/wx/control.h

@@ -113,6 +113,11 @@ public:
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxControlNameStr);
 
+    /**
+       Default constructor to allow 2-phase creation.
+    */
+    wxControl();
+    
     bool Create(wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,

interface/wx/dcbuffer.h

@@ -6,6 +6,19 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// Assumes the buffer bitmap covers the entire scrolled window,
+// and prepares the window DC accordingly
+#define wxBUFFER_VIRTUAL_AREA       0x01
+
+// Assumes the buffer bitmap only covers the client area;
+// does not prepare the window DC
+#define wxBUFFER_CLIENT_AREA        0x02
+
+// Set when not using specific buffer bitmap. Note that this
+// is private style and not returned by GetStyle.
+#define wxBUFFER_USES_SHARED_BUFFER 0x04
+
+
 /**
     @class wxBufferedDC
 
@@ -115,7 +128,7 @@ public:
     This wxDC derivative can be used inside of an @c EVT_PAINT() event handler
     to achieve double-buffered drawing. Just use this class instead of
     wxPaintDC and make sure wxWindow::SetBackgroundStyle() is called with
-    wxBG_STYLE_CUSTOM somewhere in the class initialization code, and that's
+    wxBG_STYLE_PAINT somewhere in the class initialization code, and that's
     all you have to do to (mostly) avoid flicker.
 
     The difference between wxBufferedPaintDC and this class is that this class
@@ -148,7 +161,7 @@ public:
     This is a subclass of wxBufferedDC which can be used inside of an
     @c EVT_PAINT() event handler to achieve double-buffered drawing. Just use
     this class instead of wxPaintDC and make sure
-    wxWindow::SetBackgroundStyle() is called with wxBG_STYLE_CUSTOM somewhere
+    wxWindow::SetBackgroundStyle() is called with wxBG_STYLE_PAINT somewhere
     in the class initialization code, and that's all you have to do to (mostly)
     avoid flicker. The only thing to watch out for is that if you are using
     this class together with wxScrolled, you probably do @b not want to call

interface/wx/image.h

@@ -74,6 +74,55 @@ enum wxImagePNGType
     wxPNG_TYPE_PALETTE = 4      ///< Palette encoding.
 };
 
+
+/**
+   Image option names.
+*/
+#define wxIMAGE_OPTION_QUALITY                          wxString(wxT("quality"))
+#define wxIMAGE_OPTION_FILENAME                         wxString(wxT("FileName"))
+#define wxIMAGE_OPTION_RESOLUTION                       wxString(wxT("Resolution"))
+#define wxIMAGE_OPTION_RESOLUTIONX                      wxString(wxT("ResolutionX"))
+#define wxIMAGE_OPTION_RESOLUTIONY                      wxString(wxT("ResolutionY"))
+#define wxIMAGE_OPTION_RESOLUTIONUNIT                   wxString(wxT("ResolutionUnit"))
+#define wxIMAGE_OPTION_MAX_WIDTH                        wxString(wxT("MaxWidth"))
+#define wxIMAGE_OPTION_MAX_HEIGHT                       wxString(wxT("MaxHeight"))
+
+#define wxIMAGE_OPTION_BMP_FORMAT                       wxString(wxT("wxBMP_FORMAT"))
+#define wxIMAGE_OPTION_CUR_HOTSPOT_X                    wxString(wxT("HotSpotX"))
+#define wxIMAGE_OPTION_CUR_HOTSPOT_Y                    wxString(wxT("HotSpotY"))
+
+#define wxIMAGE_OPTION_GIF_COMMENT                      wxString(wxT("GifComment"))
+
+#define wxIMAGE_OPTION_PNG_FORMAT                       wxString(wxT("PngFormat"))
+#define wxIMAGE_OPTION_PNG_BITDEPTH                     wxString(wxT("PngBitDepth"))
+#define wxIMAGE_OPTION_PNG_FILTER                       wxString(wxT("PngF"))
+#define wxIMAGE_OPTION_PNG_COMPRESSION_LEVEL            wxString(wxT("PngZL"))
+#define wxIMAGE_OPTION_PNG_COMPRESSION_MEM_LEVEL        wxString(wxT("PngZM"))
+#define wxIMAGE_OPTION_PNG_COMPRESSION_STRATEGY         wxString(wxT("PngZS"))
+#define wxIMAGE_OPTION_PNG_COMPRESSION_BUFFER_SIZE      wxString(wxT("PngZB"))
+
+#define wxIMAGE_OPTION_TIFF_BITSPERSAMPLE               wxString(wxT("BitsPerSample"))
+#define wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL             wxString(wxT("SamplesPerPixel"))
+#define wxIMAGE_OPTION_TIFF_COMPRESSION                 wxString(wxT("Compression"))
+#define wxIMAGE_OPTION_TIFF_PHOTOMETRIC                 wxString(wxT("Photometric"))
+#define wxIMAGE_OPTION_TIFF_IMAGEDESCRIPTOR             wxString(wxT("ImageDescriptor"))
+
+
+enum
+{
+    wxBMP_24BPP        = 24, // default, do not need to set
+    //wxBMP_16BPP      = 16, // wxQuantize can only do 236 colors?
+    wxBMP_8BPP         =  8, // 8bpp, quantized colors
+    wxBMP_8BPP_GREY    =  9, // 8bpp, rgb averaged to greys
+    wxBMP_8BPP_GRAY    =  wxBMP_8BPP_GREY,
+    wxBMP_8BPP_RED     = 10, // 8bpp, red used as greyscale
+    wxBMP_8BPP_PALETTE = 11, // 8bpp, use the wxImage's palette
+    wxBMP_4BPP         =  4, // 4bpp, quantized colors
+    wxBMP_1BPP         =  1, // 1bpp, quantized "colors"
+    wxBMP_1BPP_BW      =  2  // 1bpp, black & white from red
+};
+
+
 /**
     @class wxImageHandler