#pragma message enable nosimpint
#endif
-#include "wx/motif/private.h"
+// #include "wx/motif/private.h"
#if wxHAVE_LIB_XPM
#include <X11/xpm.h>
m_width = 0;
m_height = 0;
m_depth = 0;
- m_quality = 0;
- m_numColors = 0;
+ // XXX m_quality = 0;
+ // m_numColors = 0;
m_bitmapMask = NULL;
m_pixmap = (WXPixmap) 0;
m_display = (WXDisplay*) 0;
- m_freePixmap = TRUE; //TODO: necessary?
+ // m_freePixmap = TRUE; //TODO: necessary?
+#if 0
m_freeColors = (unsigned long*) 0;
m_freeColorsCount = 0;
+#endif
// These 5 variables are for wxControl
+#if 0
m_insensPixmap = (WXPixmap) 0;
m_labelPixmap = (WXPixmap) 0;
m_armPixmap = (WXPixmap) 0;
+#endif
+#if 0
m_image = (WXImage*) 0;
m_insensImage = (WXImage*) 0;
+#endif
}
wxBitmapRefData::~wxBitmapRefData()
{
+#if 0
if (m_labelPixmap)
XmDestroyPixmap (DefaultScreenOfDisplay ((Display*) m_display), (Pixmap) m_labelPixmap);
if (m_insensPixmap)
XmDestroyPixmap (DefaultScreenOfDisplay ((Display*) m_display), (Pixmap) m_insensPixmap);
+#endif
+#if 0
if (m_image)
{
XmUninstallImage ((XImage*) m_image);
XtFree ((char *) (XImage*) m_image);
}
+#endif
+#if 0
if (m_insensImage)
{
XmUninstallImage ((XImage*) m_insensImage);
delete[] ((XImage*) m_insensImage)->data;
XtFree ((char *) (XImage*) m_insensImage);
}
- if (m_pixmap && m_freePixmap)
+#endif
+ if (m_pixmap /* && m_freePixmap */)
XFreePixmap ((Display*) m_display, (Pixmap) m_pixmap);
+#if 0
if (m_freeColors)
{
int screen = DefaultScreen((Display*) m_display);
XFreeColors((Display*) m_display, cmp, &m_freeColors[llp], 1, 0L);
delete m_freeColors;
};
+#endif
if (m_bitmapMask)
delete m_bitmapMask;
m_bitmapMask = NULL;
}
-wxList wxBitmap::sm_handlers;
-
#define M_BMPDATA ((wxBitmapRefData *)m_refData)
wxBitmap::wxBitmap()
(void)Create(w, h, d);
}
-wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth)
+wxBitmap::wxBitmap(void *data, wxBitmapType type,
+ int width, int height, int depth)
{
(void) Create(data, type, width, height, depth);
}
-wxBitmap::wxBitmap(const wxString& filename, int type)
+wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
{
- LoadFile(filename, (int)type);
+ LoadFile(filename, type);
}
// Create from XPM data
M_BITMAPDATA->m_width = w;
M_BITMAPDATA->m_height = h;
M_BITMAPDATA->m_depth = d;
- M_BITMAPDATA->m_freePixmap = TRUE;
+ // M_BITMAPDATA->m_freePixmap = TRUE;
Display *dpy = (Display*) wxGetDisplay();
return M_BITMAPDATA->m_ok;
}
-bool wxBitmap::LoadFile(const wxString& filename, long type)
+bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
{
UnRef();
if (!image.LoadFile( filename, type )) return FALSE;
if (image.Ok())
{
- *this = image.ConvertToBitmap();
+ *this = wxBitmap(image);
return TRUE;
}
else return FALSE;
return handler->LoadFile(this, filename, type, -1, -1);
}
-bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
+bool wxBitmap::Create(void *data, wxBitmapType type,
+ int width, int height, int depth)
{
UnRef();
wxBitmapHandler *handler = FindHandler(type);
if ( handler == NULL ) {
- wxLogWarning("no data bitmap handler for type %ld defined.", type);
+ wxLogWarning("no data bitmap handler for type %ld defined.",
+ (long)type);
return FALSE;
}
return handler->Create(this, data, type, width, height, depth);
}
-bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *palette)
+bool wxBitmap::SaveFile(const wxString& filename, wxBitmapType type,
+ const wxPalette *palette) const
{
wxBitmapHandler *handler = FindHandler(type);
if ( handler == NULL ) { // try wxImage
- wxImage image( *this );
+ wxImage image = this->ConvertToImage();
if (image.Ok()) return image.SaveFile( filename, type );
else return FALSE;
}
M_BITMAPDATA->m_depth = d;
}
+#if 0
+
+// XXX
void wxBitmap::SetQuality(int q)
{
if (!M_BITMAPDATA)
M_BITMAPDATA->m_quality = q;
}
+#endif
+
void wxBitmap::SetOk(bool isOk)
{
if (!M_BITMAPDATA)
return ret;
}
-void wxBitmap::AddHandler(wxBitmapHandler *handler)
-{
- sm_handlers.Append(handler);
-}
-
-void wxBitmap::InsertHandler(wxBitmapHandler *handler)
-{
- sm_handlers.Insert(handler);
-}
-
-bool wxBitmap::RemoveHandler(const wxString& name)
-{
- wxBitmapHandler *handler = FindHandler(name);
- if ( handler )
- {
- sm_handlers.DeleteObject(handler);
- return TRUE;
- }
- else
- return FALSE;
-}
-
-wxBitmapHandler *wxBitmap::FindHandler(const wxString& name)
-{
- wxNode *node = sm_handlers.First();
- while ( node )
- {
- wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
- if ( handler->GetName() == name )
- return handler;
- node = node->Next();
- }
- return NULL;
-}
-
-wxBitmapHandler *wxBitmap::FindHandler(const wxString& extension, long bitmapType)
-{
- wxNode *node = sm_handlers.First();
- while ( node )
- {
- wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
- if ( handler->GetExtension() == extension &&
- (bitmapType == -1 || handler->GetType() == bitmapType) )
- return handler;
- node = node->Next();
- }
- return NULL;
-}
-
-wxBitmapHandler *wxBitmap::FindHandler(long bitmapType)
-{
- wxNode *node = sm_handlers.First();
- while ( node )
- {
- wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
- if (handler->GetType() == bitmapType)
- return handler;
- node = node->Next();
- }
- return NULL;
-}
-
/*
* wxMask
*/
IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
-bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap), void *WXUNUSED(data), long WXUNUSED(type),
- int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth))
-{
- return FALSE;
-}
-
-bool wxBitmapHandler::LoadFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), long WXUNUSED(type),
- int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))
-{
- return FALSE;
-}
-
-bool wxBitmapHandler::SaveFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), int WXUNUSED(type),
- const wxPalette *WXUNUSED(palette))
-{
- return FALSE;
-}
-
/*
* Standard handlers
*/
};
virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
- int desiredWidth, int desiredHeight);
+ int desiredWidth, int desiredHeight);
};
+
IMPLEMENT_DYNAMIC_CLASS(wxXBMFileHandler, wxBitmapHandler)
-bool wxXBMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long WXUNUSED(flags),
- int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))
+bool wxXBMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
+ long WXUNUSED(flags),
+ int WXUNUSED(desiredWidth),
+ int WXUNUSED(desiredHeight))
{
- M_BITMAPHANDLERDATA->m_freePixmap = TRUE;
+ // M_BITMAPHANDLERDATA->m_freePixmap = TRUE;
int hotX, hotY;
unsigned int w, h;
M_BITMAPDATA->m_display = (WXDisplay*) dpy;
int value = XReadBitmapFile (dpy, RootWindow (dpy, DefaultScreen (dpy)),
- (char*) (const char*) name, &w, &h, &pixmap, &hotX, &hotY);
+ wxConstCast(name.c_str(), char), &w, &h, &pixmap, &hotX, &hotY);
M_BITMAPHANDLERDATA->m_width = w;
M_BITMAPHANDLERDATA->m_height = h;
M_BITMAPHANDLERDATA->m_depth = 1;
m_type = wxBITMAP_TYPE_XBM_DATA;
};
- virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
+ virtual bool Create(wxBitmap *bitmap, void *data, long flags,
+ int width, int height, int depth = 1);
};
IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler)
-bool wxXBMDataHandler::Create( wxBitmap *bitmap, void *data, long WXUNUSED(flags),
- int width, int height, int WXUNUSED(depth))
+bool wxXBMDataHandler::Create( wxBitmap *bitmap, void *data,
+ long WXUNUSED(flags),
+ int width, int height, int WXUNUSED(depth))
{
M_BITMAPHANDLERDATA->m_width = width;
M_BITMAPHANDLERDATA->m_height = height;
M_BITMAPHANDLERDATA->m_depth = 1;
- M_BITMAPHANDLERDATA->m_freePixmap = TRUE;
+ // M_BITMAPHANDLERDATA->m_freePixmap = TRUE;
Display *dpy = (Display*) wxGetDisplay();
M_BITMAPHANDLERDATA->m_display = (WXDisplay*) dpy;
M_BITMAPHANDLERDATA->m_pixmap = (WXPixmap) XCreateBitmapFromData (dpy, RootWindow (dpy, DefaultScreen (dpy)), (char*) data, width, height);
M_BITMAPHANDLERDATA->m_ok = (M_BITMAPHANDLERDATA->m_pixmap != (WXPixmap) 0) ;
+#if 0
// code for wxControl. TODO: can we avoid doing this until we need it?
// E.g. have CreateButtonPixmaps which is called on demand.
XImage* image = (XImage *) XtMalloc (sizeof (XImage));
M_BITMAPHANDLERDATA->m_image = (WXImage*) image;
M_BITMAPHANDLERDATA->m_insensImage = (WXImage*) insensImage;
+#endif
+
+
return TRUE;
}
};
virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
- int desiredWidth, int desiredHeight);
- virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
+ int desiredWidth, int desiredHeight);
+ virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
+ wxBitmapType type, const wxPalette *palette = NULL);
};
IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
-bool wxXPMFileHandler::LoadFile( wxBitmap *bitmap, const wxString& name, long WXUNUSED(flags),
- int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight) )
+bool wxXPMFileHandler::LoadFile( wxBitmap *bitmap, const wxString& name,
+ long WXUNUSED(flags),
+ int WXUNUSED(desiredWidth),
+ int WXUNUSED(desiredHeight) )
{
Display *dpy = (Display*) wxGetDisplay();
M_BITMAPHANDLERDATA->m_display = (WXDisplay*) dpy;
xpmAttr.valuemask = XpmReturnInfos | XpmCloseness;
xpmAttr.closeness = 40000;
int errorStatus = XpmReadFileToPixmap(dpy,
- RootWindow(dpy, DefaultScreen(dpy)), (char*) (const char*) name,
+ RootWindow(dpy, DefaultScreen(dpy)),
+ wxConstCast(name.c_str(), char),
&pixmap, &mask, &xpmAttr);
if (errorStatus == XpmSuccess)
M_BITMAPHANDLERDATA->m_depth = depthRet;
- M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels;
+ // M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels;
XpmFreeAttributes(&xpmAttr);
}
}
-bool wxXPMFileHandler::SaveFile( wxBitmap *bitmap, const wxString& name, int WXUNUSED(type),
- const wxPalette *WXUNUSED(palette))
+bool wxXPMFileHandler::SaveFile( const wxBitmap *bitmap, const wxString& name,
+ wxBitmapType WXUNUSED(type),
+ const wxPalette *WXUNUSED(palette))
{
if (M_BITMAPHANDLERDATA->m_ok && M_BITMAPHANDLERDATA->m_pixmap)
{
Display *dpy = (Display*) M_BITMAPHANDLERDATA->m_display;
- int errorStatus = XpmWriteFileFromPixmap(dpy, (char*) (const char*) name,
+ int errorStatus = XpmWriteFileFromPixmap(dpy,
+ wxConstCast(name.c_str(), char),
(Pixmap) M_BITMAPHANDLERDATA->m_pixmap,
(M_BITMAPHANDLERDATA->m_bitmapMask ? (Pixmap) M_BITMAPHANDLERDATA->m_bitmapMask->GetPixmap() : (Pixmap) 0),
(XpmAttributes *) NULL);
m_type = wxBITMAP_TYPE_XPM_DATA;
};
- virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
+ virtual bool Create(wxBitmap *bitmap, void *data, long flags,
+ int width, int height, int depth = 1);
};
IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
-bool wxXPMDataHandler::Create( wxBitmap *bitmap, void *data, long WXUNUSED(flags),
+bool wxXPMDataHandler::Create( wxBitmap *bitmap, void *data,
+ long WXUNUSED(flags),
int width, int height, int WXUNUSED(depth))
{
M_BITMAPHANDLERDATA->m_width = width;
M_BITMAPHANDLERDATA->m_height = height;
M_BITMAPHANDLERDATA->m_depth = 1;
- M_BITMAPHANDLERDATA->m_freePixmap = TRUE;
+ // M_BITMAPHANDLERDATA->m_freePixmap = TRUE;
Display *dpy = (Display*) wxGetDisplay();
M_BITMAPHANDLERDATA->m_display = (WXDisplay*) dpy;
xpmAttr.valuemask |= XpmColorSymbols; // add flag
}
- Pixmap pixmap;
+ Pixmap pixmap = 0;
Pixmap mask = 0;
int ErrorStatus = XpmCreatePixmapFromData(dpy, RootWindow(dpy, DefaultScreen(dpy)),
(char**) data, &pixmap, &mask, &xpmAttr);
M_BITMAPHANDLERDATA->m_depth = depthRet;
- M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels;
+ // M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels;
XpmFreeAttributes(&xpmAttr);
M_BITMAPHANDLERDATA->m_ok = TRUE;
M_BITMAPHANDLERDATA->m_pixmap = (WXPixmap) pixmap;
#endif // wxHAVE_LIB_XPM
-void wxBitmap::CleanUpHandlers()
-{
- wxNode *node = sm_handlers.First();
- while ( node )
- {
- wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
- wxNode *next = node->Next();
- delete handler;
- delete node;
- node = next;
- }
-}
-
void wxBitmap::InitStandardHandlers()
{
// Initialize all standard bitmap or derived class handlers here.
#endif // wxHAVE_LIB_XPM
}
+#if 0
WXPixmap wxBitmap::GetLabelPixmap (WXWidget w)
{
- if (M_BITMAPDATA->m_image == (WXPixmap) 0)
+ if (!M_BITMAPDATA)
+ return (WXPixmap)NULL;
+ // if (M_BITMAPDATA->m_image == (WXPixmap) 0)
return M_BITMAPDATA->m_pixmap;
+#if 0
Display *dpy = (Display*) M_BITMAPDATA->m_display;
#ifdef FOO
M_BITMAPDATA->m_labelPixmap = (WXPixmap) XmGetPixmap (DefaultScreenOfDisplay (dpy), tmp, fg, bg);
return M_BITMAPDATA->m_labelPixmap;
+#endif
}
WXPixmap wxBitmap::GetArmPixmap (WXWidget w)
{
- if (M_BITMAPDATA->m_image == (WXPixmap) 0)
+ // if (M_BITMAPDATA->m_image == (WXPixmap) 0)
return M_BITMAPDATA->m_pixmap;
+#if 0
Display *dpy = (Display*) M_BITMAPDATA->m_display;
#ifdef FOO
// See GetLabelPixmap () comment
M_BITMAPDATA->m_armPixmap = (WXPixmap) XmGetPixmap (DefaultScreenOfDisplay (dpy), tmp, fg, bg);
return M_BITMAPDATA->m_armPixmap;
+#endif
}
WXPixmap wxBitmap::GetInsensPixmap (WXWidget w)
{
Display *dpy = (Display*) M_BITMAPDATA->m_display;
-
+
+ if (!M_BITMAPDATA)
+ return (WXPixmap)NULL;
if (M_BITMAPDATA->m_insensPixmap)
return M_BITMAPDATA->m_insensPixmap;
return M_BITMAPDATA->m_pixmap;
}
- if (M_BITMAPDATA->m_insensImage == (WXPixmap) 0)
+ // if (M_BITMAPDATA->m_insensImage == (WXPixmap) 0)
return M_BITMAPDATA->m_pixmap;
+#if 0
#ifdef FOO
See GetLabelPixmap () comment
// Must be destroyed, because colours can have been changed!
M_BITMAPDATA->m_insensPixmap = (WXPixmap) XmGetPixmap (DefaultScreenOfDisplay (dpy), tmp, fg, bg);
return M_BITMAPDATA->m_insensPixmap;
+#endif
}
+#endif
// We may need this sometime...
wxSearchColor::~wxSearchColor( void )
{
- if ( color ) delete color;
- if ( entry ) delete entry;
+ if ( color ) delete[] color;
+ if ( entry ) delete[] entry;
}
int wxSearchColor::SearchColor( int r, int g, int b )
vinfo_template.depth = bpp;
int nitem = 0;
- vi = XGetVisualInfo( dpy, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem );
+ vi = XGetVisualInfo( dpy, VisualIDMask|VisualDepthMask,
+ &vinfo_template, &nitem );
wxCHECK_MSG( vi, FALSE, wxT("no visual") );
- XFree( vi );
-
if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15;
if (bpp < 8) bpp = 8;
else if ((vi->green_mask > vi->blue_mask) && (vi->blue_mask > vi->red_mask)) b_o = GBR;
}
+ XFree( vi );
+
int r_mask = image.GetMaskRed();
int g_mask = image.GetMaskGreen();
int b_mask = image.GetMaskBlue();
projects / wxWidgets.git / blobdiff