Skip to content

K
kicad-source-mirror
Commit a6c60412 authored by Marco Serantoni's avatar Marco Serantoni
Browse files
Options

OSX: Fixes making bitmap2compoenent work.

parent 2faf4296
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 3 deletions
bitmap2component/bitmap2cmp_gui.cpp
View file @ a6c60412
...@@ -132,16 +132,28 @@ BM2CMP_FRAME::~BM2CMP_FRAME() ...@@ -132,16 +132,28 @@ BM2CMP_FRAME::~BM2CMP_FRAME()
void BM2CMP_FRAME::OnPaint( wxPaintEvent& event ) void BM2CMP_FRAME::OnPaint( wxPaintEvent& event )
{ {
#ifdef __WXMAC__
// Otherwise fails due: using wxPaintDC without being in a native paint event
wxClientDC pict_dc( m_InitialPicturePanel );
wxClientDC greyscale_dc( m_GreyscalePicturePanel );
wxClientDC nb_dc( m_BNPicturePanel );
#else
wxPaintDC pict_dc( m_InitialPicturePanel ); wxPaintDC pict_dc( m_InitialPicturePanel );
wxPaintDC greyscale_dc( m_GreyscalePicturePanel ); wxPaintDC greyscale_dc( m_GreyscalePicturePanel );
wxPaintDC nb_dc( m_BNPicturePanel ); wxPaintDC nb_dc( m_BNPicturePanel );
#endif
m_InitialPicturePanel->PrepareDC( pict_dc ); m_InitialPicturePanel->PrepareDC( pict_dc );
m_GreyscalePicturePanel->PrepareDC( greyscale_dc ); m_GreyscalePicturePanel->PrepareDC( greyscale_dc );
m_BNPicturePanel->PrepareDC( nb_dc ); m_BNPicturePanel->PrepareDC( nb_dc );
pict_dc.DrawBitmap( m_Pict_Bitmap, 0, 0, false );
greyscale_dc.DrawBitmap( m_Greyscale_Bitmap, 0, 0, false ); // OSX crashes with empty bitmaps (on initial refreshes)
nb_dc.DrawBitmap( m_BN_Bitmap, 0, 0, false ); if(m_Pict_Bitmap.IsOk() && m_Greyscale_Bitmap.IsOk() && m_BN_Bitmap.IsOk())
{
pict_dc.DrawBitmap( m_Pict_Bitmap, 0, 0, false );
greyscale_dc.DrawBitmap( m_Greyscale_Bitmap, 0, 0, false );
nb_dc.DrawBitmap( m_BN_Bitmap, 0, 0, false );
}
} }
/* Called to load a bitmap file /* Called to load a bitmap file
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment