move ScrollWindow() implementation to the base class and call private DoScrollHorz...

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

diff --git a/include/wx/image.h b/include/wx/image.h
index 40b17b20e16e8f879882200b3f117c7ace8171f1..84dcd3934d0ce72654e6672223d5529343e576a9 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -36,6 +36,9 @@
 
 #define wxIMAGE_OPTION_RESOLUTIONUNIT        wxString(_T("ResolutionUnit"))
 
 
 #define wxIMAGE_OPTION_RESOLUTIONUNIT        wxString(_T("ResolutionUnit"))
 

+#define wxIMAGE_OPTION_MAX_WIDTH             wxString(_T("MaxWidth"))
+#define wxIMAGE_OPTION_MAX_HEIGHT            wxString(_T("MaxHeight"))
+

 // constants used with wxIMAGE_OPTION_RESOLUTIONUNIT
 //
 // NB: don't change these values, they correspond to libjpeg constants
 // constants used with wxIMAGE_OPTION_RESOLUTIONUNIT
 //
 // NB: don't change these values, they correspond to libjpeg constants


@@ -233,8 +236,8 @@ public:
     bool Create( const char* const* xpmData );
 #ifdef __BORLANDC__
     // needed for Borland 5.5
     bool Create( const char* const* xpmData );
 #ifdef __BORLANDC__
     // needed for Borland 5.5

-    wxImage( char** xpmData ) { Create(wx_const_cast(const char* const*, xpmData)); }
-    bool Create( char** xpmData ) { return Create(wx_const_cast(const char* const*, xpmData)); }
+    wxImage( char** xpmData ) { Create(const_cast<const char* const*>(xpmData)); }
+    bool Create( char** xpmData ) { return Create(const_cast<const char* const*>(xpmData)); }

 #endif
     void Destroy();
 
 #endif
     void Destroy();
 


@@ -358,6 +361,9 @@ public:
     int GetWidth() const;
     int GetHeight() const;
 
     int GetWidth() const;
     int GetHeight() const;
 

+    wxSize GetSize() const
+        { return wxSize(GetWidth(), GetHeight()); }
+

     // Gets the type of image found by LoadFile or specified with SaveFile
     wxBitmapType GetType() const;
 
     // Gets the type of image found by LoadFile or specified with SaveFile
     wxBitmapType GetType() const;
 


@@ -440,18 +446,16 @@ public:
     static RGBValue HSVtoRGB(const HSVValue& hsv);
 
 #if WXWIN_COMPATIBILITY_2_8
     static RGBValue HSVtoRGB(const HSVValue& hsv);
 
 #if WXWIN_COMPATIBILITY_2_8

-    // explicitly specifying inline allows gcc < 3.4 to
-    // handle the deprecation attribute even in the constructor.
-    wxDEPRECATED(
-        inline wxImage(const wxString& name, long type, int index = -1)
+    wxDEPRECATED_CONSTRUCTOR(
+        wxImage(const wxString& name, long type, int index = -1)

         {
             LoadFile(name, (wxBitmapType)type, index);
         }
     )
 
 #if wxUSE_STREAMS
         {
             LoadFile(name, (wxBitmapType)type, index);
         }
     )
 
 #if wxUSE_STREAMS

-    wxDEPRECATED(
-        inline wxImage(wxInputStream& stream, long type, int index = -1)
+    wxDEPRECATED_CONSTRUCTOR(
+        wxImage(wxInputStream& stream, long type, int index = -1)

         {
             LoadFile(stream, (wxBitmapType)type, index);
         }
         {
             LoadFile(stream, (wxBitmapType)type, index);
         }