#endif // wxUSE_CLIPBOARD
#include "smile.xbm"
+#include "smile.xpm"
-#if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW
- #include "smile.xpm"
-#endif
-
-#if defined(__WXMSW__) || defined(__WXMAC__)
+#if defined(__WXMSW__)
#ifdef wxHAVE_RAW_BITMAP
#include "wx/rawbmp.h"
#endif
#endif
+#if defined(__WXMAC__) || defined(__WXGTK__)
+ #define wxHAVE_RAW_BITMAP
+ #include "wx/rawbmp.h"
+#endif
+
// derived classes
class MyFrame;
{
public:
MyImageFrame(wxFrame *parent, const wxBitmap& bitmap)
- : wxFrame(parent, -1, _T("Double click to save"),
+ : wxFrame(parent, wxID_ANY, _T("Double click to save"),
wxDefaultPosition, wxDefaultSize,
wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX),
m_bitmap(bitmap)
void OnPaint(wxPaintEvent& WXUNUSED(event))
{
wxPaintDC dc( this );
- dc.DrawBitmap( m_bitmap, 0, 0, TRUE /* use mask */ );
+ dc.DrawBitmap( m_bitmap, 0, 0, true /* use mask */ );
}
void OnSave(wxMouseEvent& WXUNUSED(event))
wxT("PCX files (*.pcx)|*.pcx|")
wxT("ICO files (*.ico)|*.ico|")
wxT("CUR files (*.cur)|*.cur"),
- wxSAVE);
+ wxSAVE,
+ this);
if ( savefilename.empty() )
return;
{
unsigned char *cmap = new unsigned char [256];
for ( int i = 0; i < 256; i++ )
- cmap[i] = i;
+ cmap[i] = (unsigned char)i;
image.SetPalette(wxPalette(256, cmap, cmap, cmap));
delete cmap;
};
MyRawBitmapFrame(wxFrame *parent)
- : wxFrame(parent, -1, _T("Raw bitmaps (how exciting)")),
+ : wxFrame(parent, wxID_ANY, _T("Raw bitmaps (how exciting)")),
m_bitmap(SIZE, SIZE, 32)
{
SetClientSize(SIZE, SIZE);
return;
}
- data.UseAlpha();
+// data.UseAlpha();
Data::Iterator p(data);
dc.DrawText(_T("This is alpha and raw bitmap test"), 0, BORDER);
dc.DrawText(_T("This is alpha and raw bitmap test"), 0, SIZE/2 - BORDER);
dc.DrawText(_T("This is alpha and raw bitmap test"), 0, SIZE - 2*BORDER);
- dc.DrawBitmap( m_bitmap, 0, 0, TRUE /* use mask */ );
+ dc.DrawBitmap( m_bitmap, 0, 0, true /* use mask */ );
}
private:
MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size )
: wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER )
-#if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW
, m_bmpSmileXpm((const char **) smile_xpm)
, m_iconSmileXpm((const char **) smile_xpm)
-#endif
{
my_horse_png = (wxBitmap*) NULL;
my_horse_jpeg = (wxBitmap*) NULL;
my_smile_xbm = new wxBitmap( (const char*)smile_bits, smile_width,
smile_height, 1 );
-#if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW
// demonstrates XPM automatically using the mask when saving
if ( m_bmpSmileXpm.Ok() )
m_bmpSmileXpm.SaveFile(_T("saved.xpm"), wxBITMAP_TYPE_XPM);
-#endif
#if wxUSE_ICO_CUR
image.Destroy();
tmp << i ;
wxLogError(tmp);
}
- else
+ else
my_horse_ani [i] = wxBitmap( image );
}
#endif // wxUSE_ICO_CUR
wxFile file(dir + _T("horse.bmp"));
if ( file.IsOpened() )
{
- off_t len = file.Length();
- void *data = malloc(len);
- if ( file.Read(data, len) != len )
+ wxFileOffset len = file.Length();
+ size_t dataSize = (size_t)len;
+ void *data = malloc(dataSize);
+ if ( file.Read(data, dataSize) != len )
wxLogError(_T("Reading bitmap file failed"));
else
{
- wxMemoryInputStream mis(data, len);
+ wxMemoryInputStream mis(data, dataSize);
if ( !image.LoadFile(mis) )
wxLogError(wxT("Can't load BMP image from stream"));
else
wxRED_PEN->GetColour().Red(),
wxRED_PEN->GetColour().Green(),
wxRED_PEN->GetColour().Blue() );
- dc.DrawBitmap( wxBitmap(i), 150, 2010, TRUE );
+ dc.DrawBitmap( wxBitmap(i), 150, 2010, true );
dc.SetTextForeground( wxT("BLACK") );
}
memdc.SetBrush( *wxWHITE_BRUSH );
memdc.DrawRectangle( 0,0,60,50 );
memdc.SetTextForeground( *wxBLACK );
+#ifndef __WXGTK20__
+ // I cannot convince GTK2 to draw into mono bitmaps
memdc.DrawText( _T("Hi!"), 5, 5 );
+#endif
memdc.SetBrush( *wxBLACK_BRUSH );
memdc.DrawRectangle( 33,5,20,20 );
memdc.SetPen( *wxRED_PEN );
wxRED_PEN->GetColour().Red(),
wxRED_PEN->GetColour().Green(),
wxRED_PEN->GetColour().Blue() );
- dc.DrawBitmap( wxBitmap(i), 150, 2130, TRUE );
+ dc.DrawBitmap( wxBitmap(i), 150, 2130, true );
dc.SetTextForeground( wxT("BLACK") );
}
- dc.DrawText(_T("XPM bitmap"), 30, 2230);
+ // For testing transparency
+ dc.SetBrush( *wxRED_BRUSH );
+ dc.DrawRectangle( 20, 2220, 560, 68 );
+
+ dc.DrawText(_T("XPM bitmap"), 30, 2230 );
if ( m_bmpSmileXpm.Ok() )
- {
- dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, TRUE);
- }
+ dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, true);
- dc.DrawText(_T("XPM icon"), 150, 2230);
+ dc.DrawText(_T("XPM icon"), 110, 2230 );
if ( m_iconSmileXpm.Ok() )
+ dc.DrawIcon(m_iconSmileXpm, 110, 2250);
+
+ // testing icon -> bitmap conversion
+ wxBitmap to_blit( m_iconSmileXpm );
+ if (to_blit.Ok())
{
- dc.DrawIcon(m_iconSmileXpm, 150, 2250);
+ dc.DrawText( _T("SubBitmap"), 170, 2230 );
+ wxBitmap sub = to_blit.GetSubBitmap( wxRect(0,0,15,15) );
+ if (sub.Ok())
+ dc.DrawBitmap( sub, 170, 2250, true );
+
+ dc.DrawText( _T("Enlarged"), 250, 2230 );
+ dc.SetUserScale( 1.5, 1.5 );
+ dc.DrawBitmap( to_blit, (int)(250/1.5), (int)(2250/1.5), true );
+ dc.SetUserScale( 2, 2 );
+ dc.DrawBitmap( to_blit, (int)(300/2), (int)(2250/2), true );
+ dc.SetUserScale( 1.0, 1.0 );
+
+ dc.DrawText( _T("Blit"), 400, 2230);
+ wxMemoryDC blit_dc;
+ blit_dc.SelectObject( to_blit );
+ dc.Blit( 400, 2250, to_blit.GetWidth(), to_blit.GetHeight(), &blit_dc, 0, 0, wxCOPY, true );
+ dc.SetUserScale( 1.5, 1.5 );
+ dc.Blit( (int)(450/1.5), (int)(2250/1.5), to_blit.GetWidth(), to_blit.GetHeight(), &blit_dc, 0, 0, wxCOPY, true );
+ dc.SetUserScale( 2, 2 );
+ dc.Blit( (int)(500/2), (int)(2250/2), to_blit.GetWidth(), to_blit.GetHeight(), &blit_dc, 0, 0, wxCOPY, true );
+ dc.SetUserScale( 1.0, 1.0 );
}
dc.DrawText( _T("ICO handler (1st image)"), 30, 2290 );
if (my_horse_ico32 && my_horse_ico32->Ok())
- dc.DrawBitmap( *my_horse_ico32, 30, 2330, TRUE );
+ dc.DrawBitmap( *my_horse_ico32, 30, 2330, true );
dc.DrawText( _T("ICO handler (2nd image)"), 230, 2290 );
if (my_horse_ico16 && my_horse_ico16->Ok())
- dc.DrawBitmap( *my_horse_ico16, 230, 2330, TRUE );
+ dc.DrawBitmap( *my_horse_ico16, 230, 2330, true );
dc.DrawText( _T("ICO handler (best image)"), 430, 2290 );
if (my_horse_ico && my_horse_ico->Ok())
- dc.DrawBitmap( *my_horse_ico, 430, 2330, TRUE );
+ dc.DrawBitmap( *my_horse_ico, 430, 2330, true );
dc.DrawText( _T("CUR handler"), 30, 2390 );
if (my_horse_cur && my_horse_cur->Ok())
{
- dc.DrawBitmap( *my_horse_cur, 30, 2420, TRUE );
+ dc.DrawBitmap( *my_horse_cur, 30, 2420, true );
dc.SetPen (*wxRED_PEN);
dc.DrawLine (xH-10,yH,xH+10,yH);
dc.DrawLine (xH,yH-10,xH,yH+10);
for (i=0; i < m_ani_images; i ++)
if (my_horse_ani[i].Ok())
{
- dc.DrawBitmap( my_horse_ani[i], 230 + i * 2 * my_horse_ani[i].GetWidth() , 2420, TRUE );
+ dc.DrawBitmap( my_horse_ani[i], 230 + i * 2 * my_horse_ani[i].GetWidth() , 2420, true );
}
}
original.GetBlue( x*2, y*2+1 ) +
original.GetBlue( x*2+1, y*2+1 );
blue = blue/4;
- anti.SetRGB( x, y, red, green, blue );
+ anti.SetRGB( x, y, (unsigned char)red, (unsigned char)green, (unsigned char)blue );
}
my_anti = new wxBitmap(anti);
}
END_EVENT_TABLE()
MyFrame::MyFrame()
- : wxFrame( (wxFrame *)NULL, -1, _T("wxImage sample"),
+ : wxFrame( (wxFrame *)NULL, wxID_ANY, _T("wxImage sample"),
wxPoint(20,20), wxSize(470,360) )
{
wxMenuBar *menu_bar = new wxMenuBar();
SetMenuBar( menu_bar );
+#if wxUSE_STATUSBAR
CreateStatusBar(2);
int widths[] = { -1, 100 };
SetStatusWidths( 2, widths );
+#endif // wxUSE_STATUSBAR
- m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
+ m_canvas = new MyCanvas( this, wxID_ANY, wxPoint(0,0), wxSize(10,10) );
// 500 width * 2500 height
m_canvas->SetScrollbars( 10, 10, 50, 250 );
void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
{
- Close( TRUE );
+ Close( true );
}
void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
#endif
wxFrame *frame = new MyFrame();
- frame->Show( TRUE );
+ frame->Show( true );
- return TRUE;
+ return true;
}
projects / wxWidgets.git / blobdiff