Add some new files for interface additions

[wxWidgets.git] / src / motif / bitmap.cpp

diff --git a/src/motif/bitmap.cpp b/src/motif/bitmap.cpp
index 45f0cf6d0f3fd2771bfe217fc342c61a18e0680c..524d851c606b6297f659cd22791501f23638a0fc 100644 (file)
--- a/src/motif/bitmap.cpp
+++ b/src/motif/bitmap.cpp
@@ -13,6 +13,10 @@
 #pragma implementation "bitmap.h"
 #endif
 
 #pragma implementation "bitmap.h"
 #endif
 

+#ifdef __VMS
+#define XtParent XTPARENT
+#endif
+

 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/palette.h"
 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/palette.h"


@@ -23,7 +27,13 @@
 #include "wx/dcmemory.h"
 #include "wx/image.h"
 
 #include "wx/dcmemory.h"
 #include "wx/image.h"
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <Xm/Xm.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 


@@ -31,10 +41,8 @@
     #include <X11/xpm.h>
 #endif
 
     #include <X11/xpm.h>
 #endif
 

-#if !USE_SHARED_LIBRARIES
-    IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
+IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)

 
 wxBitmapRefData::wxBitmapRefData()
 {
 
 wxBitmapRefData::wxBitmapRefData()
 {


@@ -104,6 +112,8 @@ wxBitmapRefData::~wxBitmapRefData()
 
 wxList wxBitmap::sm_handlers;
 
 
 wxList wxBitmap::sm_handlers;
 

+#define M_BMPDATA ((wxBitmapRefData *)m_refData)
+

 wxBitmap::wxBitmap()
 {
     m_refData = NULL;
 wxBitmap::wxBitmap()
 {
     m_refData = NULL;


@@ -164,6 +174,13 @@ wxBitmap::wxBitmap(char **data, wxControl* control)
     sg_Control = (wxControl*) NULL;
 }
 
     sg_Control = (wxControl*) NULL;
 }
 

+bool wxBitmap::CreateFromXpm(const char **bits)
+{
+    wxCHECK_MSG( bits, FALSE, _T("NULL pointer in wxBitmap::CreateFromXpm") );
+
+    return Create(bits, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
+}
+

 bool wxBitmap::Create(int w, int h, int d)
 {
     UnRef();
 bool wxBitmap::Create(int w, int h, int d)
 {
     UnRef();


@@ -297,6 +314,20 @@ void wxBitmap::SetMask(wxMask *mask)
     M_BITMAPDATA->m_bitmapMask = mask ;
 }
 
     M_BITMAPDATA->m_bitmapMask = mask ;
 }
 

+wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
+{
+    wxCHECK_MSG( Ok() &&
+                 (rect.x >= 0) && (rect.y >= 0) &&
+                 (rect.x+rect.width <= M_BMPDATA->m_width) && (rect.y+rect.height <= M_BMPDATA->m_height),
+                 wxNullBitmap, wxT("invalid bitmap or bitmap region") );
+
+    wxBitmap ret( rect.width, rect.height, 0 );
+    wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
+
+   // The remaining still TODO
+   return ret;
+}
+

 void wxBitmap::AddHandler(wxBitmapHandler *handler)
 {
     sm_handlers.Append(handler);
 void wxBitmap::AddHandler(wxBitmapHandler *handler)
 {
     sm_handlers.Append(handler);


@@ -824,10 +855,10 @@ WXPixmap wxBitmap::GetLabelPixmap (WXWidget w)
 
         this is a catch22!!
 
 
         this is a catch22!!
 

-          So, before doing thing really clean, I just do nothing; if the pixmap is
-          referenced by many widgets, Motif performs caching functions.
-          And if pixmap is referenced with multiples colors, we just have some
-          memory leaks... I hope we can deal with them...
+      So, before doing thing really clean, I just do nothing; if the pixmap is
+      referenced by many widgets, Motif performs caching functions.
+      And if pixmap is referenced with multiples colors, we just have some
+      memory leaks... I hope we can deal with them...

     */
     // Must be destroyed, because colours can have been changed!
     if (M_BITMAPDATA->m_labelPixmap)
     */
     // Must be destroyed, because colours can have been changed!
     if (M_BITMAPDATA->m_labelPixmap)


@@ -856,26 +887,27 @@ WXPixmap wxBitmap::GetArmPixmap (WXWidget w)
 
     Display *dpy = (Display*) M_BITMAPDATA->m_display;
 #ifdef FOO
 
     Display *dpy = (Display*) M_BITMAPDATA->m_display;
 #ifdef FOO

-    See GetLabelPixmap () comment
-        // Must be destroyed, because colours can have been changed!
-        if (M_BITMAPDATA->m_armPixmap)
-            XmDestroyPixmap (DefaultScreenOfDisplay (dpy), M_BITMAPDATA->m_armPixmap);
+    // See GetLabelPixmap () comment
+
+    // Must be destroyed, because colours can have been changed!
+    if (M_BITMAPDATA->m_armPixmap)
+        XmDestroyPixmap (DefaultScreenOfDisplay (dpy), M_BITMAPDATA->m_armPixmap);

 #endif
 
 #endif
 

-        char tmp[128];
-        sprintf (tmp, "Im%x", (unsigned int) M_BITMAPDATA->m_image);
+    char tmp[128];
+    sprintf (tmp, "Im%x", (unsigned int) M_BITMAPDATA->m_image);

 
 

-        Pixel fg, bg;
-        Widget widget = (Widget) w;
+    Pixel fg, bg;
+    Widget widget = (Widget) w;

 
 

-        XtVaGetValues (widget, XmNarmColor, &bg, NULL);
-        while (XmIsGadget (widget))
-            widget = XtParent (widget);
-        XtVaGetValues (widget, XmNforeground, &fg, NULL);
+    XtVaGetValues (widget, XmNarmColor, &bg, NULL);
+    while (XmIsGadget (widget))
+        widget = XtParent (widget);
+    XtVaGetValues (widget, XmNforeground, &fg, NULL);

 
 

-        M_BITMAPDATA->m_armPixmap = (WXPixmap) XmGetPixmap (DefaultScreenOfDisplay (dpy), tmp, fg, bg);
+    M_BITMAPDATA->m_armPixmap = (WXPixmap) XmGetPixmap (DefaultScreenOfDisplay (dpy), tmp, fg, bg);

 
 

-        return M_BITMAPDATA->m_armPixmap;
+    return M_BITMAPDATA->m_armPixmap;

 }
 
 WXPixmap wxBitmap::GetInsensPixmap (WXWidget w)
 }
 
 WXPixmap wxBitmap::GetInsensPixmap (WXWidget w)


@@ -904,19 +936,19 @@ WXPixmap wxBitmap::GetInsensPixmap (WXWidget w)
             XmDestroyPixmap (DefaultScreenOfDisplay (dpy), (Pixmap) M_BITMAPDATA->m_insensPixmap);
 #endif
 
             XmDestroyPixmap (DefaultScreenOfDisplay (dpy), (Pixmap) M_BITMAPDATA->m_insensPixmap);
 #endif
 

-        char tmp[128];
-        sprintf (tmp, "Not%x", (unsigned int) M_BITMAPDATA->m_insensImage);
+    char tmp[128];
+    sprintf (tmp, "Not%x", (unsigned int) M_BITMAPDATA->m_insensImage);

 
 

-        Pixel fg, bg;
-        Widget widget = (Widget) w;
+    Pixel fg, bg;
+    Widget widget = (Widget) w;

 
 

-        while (XmIsGadget (widget))
-            widget = XtParent (widget);
-        XtVaGetValues (widget, XmNbackground, &bg, XmNforeground, &fg, NULL);
+    while (XmIsGadget (widget))
+        widget = XtParent (widget);
+    XtVaGetValues (widget, XmNbackground, &bg, XmNforeground, &fg, NULL);

 
 

-        M_BITMAPDATA->m_insensPixmap = (WXPixmap) XmGetPixmap (DefaultScreenOfDisplay (dpy), tmp, fg, bg);
+    M_BITMAPDATA->m_insensPixmap = (WXPixmap) XmGetPixmap (DefaultScreenOfDisplay (dpy), tmp, fg, bg);

 
 

-        return M_BITMAPDATA->m_insensPixmap;
+    return M_BITMAPDATA->m_insensPixmap;

 }
 
 // We may need this sometime...
 }
 
 // We may need this sometime...


@@ -926,30 +958,30 @@ WXPixmap wxBitmap::GetInsensPixmap (WXWidget w)
   NAME
   XCreateInsensitivePixmap - create a grayed-out copy of a pixmap
 
   NAME
   XCreateInsensitivePixmap - create a grayed-out copy of a pixmap
 

-    SYNOPSIS
-    Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap )
+  SYNOPSIS
+  Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap )

 
 

-      DESCRIPTION
-      This function creates a grayed-out copy of the argument pixmap, suitable
-      for use as a XmLabel's XmNlabelInsensitivePixmap resource.
+  DESCRIPTION
+  This function creates a grayed-out copy of the argument pixmap, suitable
+  for use as a XmLabel's XmNlabelInsensitivePixmap resource.

 
 

-        RETURN VALUES
-        The return value is the new Pixmap id or zero on error.  Errors include
-        a NULL display argument or an invalid Pixmap argument.
+  RETURN VALUES
+  The return value is the new Pixmap id or zero on error.  Errors include
+  a NULL display argument or an invalid Pixmap argument.

 
 

-          ERRORS
-          If one of the XLib functions fail, it will produce a X error.  The
-          default X error handler prints a diagnostic and calls exit().
+  ERRORS
+  If one of the XLib functions fail, it will produce a X error.  The
+  default X error handler prints a diagnostic and calls exit().

 
 

-            SEE ALSO
-            XCopyArea(3), XCreateBitmapFromData(3), XCreateGC(3), XCreatePixmap(3),
-            XFillRectangle(3), exit(2)
+  SEE ALSO
+  XCopyArea(3), XCreateBitmapFromData(3), XCreateGC(3), XCreatePixmap(3),
+  XFillRectangle(3), exit(2)

 
 

-              AUTHOR
-              John R Veregge - john@puente.jpl.nasa.gov
-              Advanced Engineering and Prototyping Group (AEG)
-              Information Systems Technology Section (395)
-              Jet Propulsion Lab - Calif Institute of Technology
+  AUTHOR
+  John R Veregge - john@puente.jpl.nasa.gov
+  Advanced Engineering and Prototyping Group (AEG)
+  Information Systems Technology Section (395)
+  Jet Propulsion Lab - Calif Institute of Technology

 
 *****************************************************************************/
 
 
 *****************************************************************************/
 


@@ -957,14 +989,13 @@ Pixmap
 XCreateInsensitivePixmap( Display *display, Pixmap pixmap )
 
 {
 XCreateInsensitivePixmap( Display *display, Pixmap pixmap )
 
 {

-    static
-        char    stipple_data[] =
-    {
-        0x55, 0x55, 0xAA, 0xAA, 0x55, 0x55, 0xAA, 0xAA,
+    static char stipple_data[] =
+        {
+            0x55, 0x55, 0xAA, 0xAA, 0x55, 0x55, 0xAA, 0xAA,

             0x55, 0x55, 0xAA, 0xAA, 0x55, 0x55, 0xAA, 0xAA,
             0x55, 0x55, 0xAA, 0xAA, 0x55, 0x55, 0xAA, 0xAA,
             0x55, 0x55, 0xAA, 0xAA, 0x55, 0x55, 0xAA, 0xAA
             0x55, 0x55, 0xAA, 0xAA, 0x55, 0x55, 0xAA, 0xAA,
             0x55, 0x55, 0xAA, 0xAA, 0x55, 0x55, 0xAA, 0xAA,
             0x55, 0x55, 0xAA, 0xAA, 0x55, 0x55, 0xAA, 0xAA

-    };
+        };

     GC        gc;
     Pixmap    ipixmap, stipple;
     unsigned    width, height, depth;
     GC        gc;
     Pixmap    ipixmap, stipple;
     unsigned    width, height, depth;


@@ -979,30 +1010,30 @@ XCreateInsensitivePixmap( Display *display, Pixmap pixmap )
         return ipixmap;
 
     if ( 0 == XGetGeometry( display, pixmap, &window, &x, &y,
         return ipixmap;
 
     if ( 0 == XGetGeometry( display, pixmap, &window, &x, &y,

-        &width, &height, &border, &depth )
-        )
+                &width, &height, &border, &depth )
+       )

         return ipixmap; /* BadDrawable: probably an invalid pixmap */
 
         return ipixmap; /* BadDrawable: probably an invalid pixmap */
 

-                        /* Get the stipple pixmap to be used to 'gray-out' the argument pixmap.
-    */
+    /* Get the stipple pixmap to be used to 'gray-out' the argument pixmap.
+     */

     stipple = XCreateBitmapFromData( display, pixmap, stipple_data, 16, 16 );
     if ( 0 != stipple )
     {
         gc = XCreateGC( display, pixmap, (XtGCMask)0, (XGCValues*)NULL );
         if ( NULL != gc )
         {
     stipple = XCreateBitmapFromData( display, pixmap, stipple_data, 16, 16 );
     if ( 0 != stipple )
     {
         gc = XCreateGC( display, pixmap, (XtGCMask)0, (XGCValues*)NULL );
         if ( NULL != gc )
         {

-        /* Create an identical copy of the argument pixmap.
-            */
+            /* Create an identical copy of the argument pixmap.
+             */

             ipixmap = XCreatePixmap( display, pixmap, width, height, depth );
             if ( 0 != ipixmap )
             {
             ipixmap = XCreatePixmap( display, pixmap, width, height, depth );
             if ( 0 != ipixmap )
             {

-            /* Copy the argument pixmap into the new pixmap.
-                */
+                /* Copy the argument pixmap into the new pixmap.
+                 */

                 XCopyArea( display, pixmap, ipixmap,
                 XCopyArea( display, pixmap, ipixmap,

-                    gc, 0, 0, width, height, 0, 0 );
+                        gc, 0, 0, width, height, 0, 0 );

 
 

-                    /* Refill the new pixmap using the stipple algorithm/pixmap.
-                */
+                /* Refill the new pixmap using the stipple algorithm/pixmap.
+                 */

                 XSetStipple( display, gc, stipple );
                 XSetFillStyle( display, gc, FillStippled );
                 XFillRectangle( display, ipixmap, gc, 0, 0, width, height );
                 XSetStipple( display, gc, stipple );
                 XSetFillStyle( display, gc, FillStippled );
                 XFillRectangle( display, ipixmap, gc, 0, 0, width, height );


@@ -1016,7 +1047,7 @@ XCreateInsensitivePixmap( Display *display, Pixmap pixmap )
 
 // Creates a bitmap with transparent areas drawn in
 // the given colour.
 
 // Creates a bitmap with transparent areas drawn in
 // the given colour.

-wxBitmap wxCreateMaskedBitmap(wxBitmap& bitmap, wxColour& colour)
+wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, wxColour& colour)

 {
     wxBitmap newBitmap(bitmap.GetWidth(),
         bitmap.GetHeight(),
 {
     wxBitmap newBitmap(bitmap.GetWidth(),
         bitmap.GetHeight(),