AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

corrected for compilation under Mac OS X with -cpp-precomp option

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot 2001-06-23 17:01:43 +00:00
parent 6d5e730730
commit 6868c3eb8f
7 changed files with 98 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/mac/pngread.h
View File

@ -52,7 +52,7 @@ protected:
GWorldPtr lpbi;
int bgindex;
wxPalette* Palette;
wxPalette* m_palette;
bool imageOK;
friend class wxPNGReaderIter;
public:
@ -80,7 +80,7 @@ public:
bool SetPalette(wxPalette* colourmap);
bool SetPalette(int n, rgb_color_struct *rgb_struct);
bool SetPalette(int n, byte *r, byte *g=0, byte *b=0);
wxPalette* GetPalette() const { return Palette; }
wxPalette* GetPalette() const { return m_palette; }
void NullData();
inline int GetBGIndex(void) { return bgindex; }

6
src/mac/carbon/control.cpp
View File

@ -514,7 +514,8 @@ void wxControl::DoSetSize(int x, int y,
MacRepositionScrollBars() ;
// To consider -> should the parameters be the effective or the virtual coordinates (AdjustForParent..)
wxMoveEvent event(wxPoint(m_x, m_y), m_windowId);
wxPoint point(m_x, m_y);
wxMoveEvent event(point, m_windowId);
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
}
@ -534,7 +535,8 @@ void wxControl::DoSetSize(int x, int y,
}
MacRepositionScrollBars() ;
wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
wxSize size(m_width, m_height);
wxSizeEvent event(size, m_windowId);
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
}

70
src/mac/carbon/pnghand.cpp
View File

@ -10,15 +10,15 @@
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma implementation "pngread.h"
#pragma implementation "pnghand.h"
# pragma implementation "pngread.h"
# pragma implementation "pnghand.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
# pragma hdrstop
#endif
#include <stdlib.h>
@ -79,7 +79,7 @@ wxPNGReader::wxPNGReader(void)
lpbi = NULL;
bgindex = -1;
Palette = 0;
m_palette = 0;
imageOK = FALSE;
}
@ -91,7 +91,7 @@ wxPNGReader::wxPNGReader ( char* ImageFileName )
Width = 0; Height = 0; // Dimensions
Depth = 0; // (bits x pixel)
ColorType = 0; // Bit 1 = Palette used
ColorType = 0; // Bit 1 = m_palette used
// Bit 2 = Color used
// Bit 3 = Alpha used
@ -99,7 +99,7 @@ wxPNGReader::wxPNGReader ( char* ImageFileName )
lpbi = NULL;
bgindex = -1;
Palette = 0;
m_palette = 0;
imageOK = ReadFile (ImageFileName);
}
@ -109,10 +109,10 @@ wxPNGReader::Create(int width, int height, int depth, int colortype)
{
Width = width; Height = height; Depth = depth;
ColorType = (colortype>=0) ? colortype: ((Depth>8) ? COLORTYPE_COLOR: 0);
delete Palette;
delete m_palette;
delete[] RawImage ;
RawImage = 0;
Palette = 0;
m_palette = 0;
if (lpbi)
{
@ -137,7 +137,7 @@ wxPNGReader::~wxPNGReader ( )
if (lpbi) {
wxMacDestroyGWorld( lpbi ) ;
}
delete Palette;
delete m_palette;
}
@ -154,10 +154,10 @@ bool wxPNGReader::GetRGB(int x, int y, byte* r, byte* g, byte* b)
{
if (!Inside(x, y)) return FALSE;
if (Palette) {
return Palette->GetRGB(GetIndex(x, y), r, g, b);
if (m_palette) {
return m_palette->GetRGB(GetIndex(x, y), r, g, b);
/* PALETTEENTRY entry;
::GetPaletteEntries((HPALETTE) Palette->GetHPALETTE(), GetIndex(x, y), 1, &entry);
::GetPaletteEntries((HPALETTE) m_palette->GetHPALETTE(), GetIndex(x, y), 1, &entry);
*r = entry.peRed;
*g = entry.peGreen;
*b = entry.peBlue; */
@ -187,8 +187,8 @@ bool wxPNGReader::SetRGB(int x, int y, byte r, byte g, byte b)
if (ColorType & COLORTYPE_PALETTE)
{
if (!Palette) return FALSE;
SetIndex(x, y, Palette->GetPixel(r, g, b));
if (!m_palette) return FALSE;
SetIndex(x, y, m_palette->GetPixel(r, g, b));
} else {
ImagePointerType ImagePointer = RawImage + EfeWidth*y + (x*Depth >> 3);
@ -202,37 +202,37 @@ bool wxPNGReader::SetRGB(int x, int y, byte r, byte g, byte b)
bool wxPNGReader::SetPalette(wxPalette* colourmap)
{
delete Palette ;
delete m_palette ;
if (!colourmap)
return FALSE;
ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR);
Palette = new wxPalette( *colourmap );
m_palette = new wxPalette( *colourmap );
return true ;
// return (DibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
// return (DibSetUsage(lpbi, (HPALETTE) m_palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
}
bool
wxPNGReader::SetPalette(int n, byte *r, byte *g, byte *b)
{
delete Palette ;
Palette = new wxPalette();
if (!Palette)
delete m_palette ;
m_palette = new wxPalette();
if (!m_palette)
return FALSE;
if (!g) g = r;
if (!b) b = g;
Palette->Create(n, r, g, b);
m_palette->Create(n, r, g, b);
ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR);
return true ;
// return (DibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
// return (DibSetUsage(lpbi, (HPALETTE) m_palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
}
bool
wxPNGReader::SetPalette(int n, rgb_color_struct *rgb_struct)
{
delete Palette ;
Palette = new wxPalette();
if (!Palette)
delete m_palette ;
m_palette = new wxPalette();
if (!m_palette)
return FALSE;
byte r[256], g[256], b[256];
@ -249,10 +249,10 @@ wxPNGReader::SetPalette(int n, rgb_color_struct *rgb_struct)
if (bgindex != -1)
r[bgindex] = g[bgindex] = b[bgindex] = 0;
Palette->Create(n, r, g, b);
m_palette->Create(n, r, g, b);
ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR);
return true ;
// return (DibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
// return (DibSetUsage(lpbi, (HPALETTE) m_palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
}
void wxPNGReader::NullData()
@ -260,9 +260,9 @@ void wxPNGReader::NullData()
if (lpbi) {
wxMacDestroyGWorld( lpbi ) ;
}
delete Palette;
delete m_palette;
lpbi = NULL;
Palette = NULL;
m_palette = NULL;
}
wxBitmap* wxPNGReader::GetBitmap(void)
@ -285,8 +285,8 @@ bool wxPNGReader::InstantiateBitmap(wxBitmap *bitmap)
bitmap->SetWidth(GetWidth());
bitmap->SetHeight(GetHeight());
bitmap->SetDepth(GetDepth());
if ( GetDepth() > 1 && Palette )
bitmap->SetPalette(*Palette);
if ( GetDepth() > 1 && m_palette )
bitmap->SetPalette(*m_palette);
bitmap->SetOk(TRUE);
@ -317,9 +317,9 @@ bool wxPNGReader::InstantiateBitmap(wxBitmap *bitmap)
ReleaseDC(NULL, dc2);
HBITMAP oldBitmap = (HBITMAP) ::SelectObject(dc, tmpBitmap);
if ( Palette )
if ( m_palette )
{
HPALETTE oldPal = ::SelectPalette(dc, (HPALETTE) Palette->GetHPALETTE(), FALSE);
HPALETTE oldPal = ::SelectPalette(dc, (HPALETTE) m_palette->GetHPALETTE(), FALSE);
::RealizePalette(dc);
}
@ -337,8 +337,8 @@ bool wxPNGReader::InstantiateBitmap(wxBitmap *bitmap)
bitmap->SetWidth(GetWidth());
bitmap->SetHeight(GetHeight());
bitmap->SetDepth(GetDepth());
if ( GetDepth() > 1 && Palette )
bitmap->SetPalette(*Palette);
if ( GetDepth() > 1 && m_palette )
bitmap->SetPalette(*m_palette);
bitmap->SetOk(TRUE);

15
src/mac/carbon/window.cpp
View File

@ -689,16 +689,18 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
MacRepositionScrollBars() ;
if ( doMove )
{
wxMoveEvent event(wxPoint(m_x, m_y), m_windowId);
wxPoint point(m_x, m_y);
wxMoveEvent event(point, m_windowId);
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event) ;
}
if ( doResize )
{
MacRepositionScrollBars() ;
wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
MacRepositionScrollBars() ;
wxSize size(m_width, m_height);
wxSizeEvent event(size, m_windowId);
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
}
}
}
@ -757,7 +759,8 @@ bool wxWindow::Show(bool show)
UMASelectWindow( m_macWindowData->m_macWindow ) ;
// no need to generate events here, they will get them triggered by macos
// actually they should be , but apparently they are not
wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
wxSize size(m_width, m_height);
wxSizeEvent event(size, m_windowId);
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
}

6
src/mac/control.cpp
View File

@ -514,7 +514,8 @@ void wxControl::DoSetSize(int x, int y,
MacRepositionScrollBars() ;
// To consider -> should the parameters be the effective or the virtual coordinates (AdjustForParent..)
wxMoveEvent event(wxPoint(m_x, m_y), m_windowId);
wxPoint point(m_x, m_y);
wxMoveEvent event(point, m_windowId);
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
}
@ -534,7 +535,8 @@ void wxControl::DoSetSize(int x, int y,
}
MacRepositionScrollBars() ;
wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
wxSize size(m_width, m_height);
wxSizeEvent event(size, m_windowId);
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
}

70
src/mac/pnghand.cpp
View File

@ -10,15 +10,15 @@
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma implementation "pngread.h"
#pragma implementation "pnghand.h"
# pragma implementation "pngread.h"
# pragma implementation "pnghand.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
# pragma hdrstop
#endif
#include <stdlib.h>
@ -79,7 +79,7 @@ wxPNGReader::wxPNGReader(void)
lpbi = NULL;
bgindex = -1;
Palette = 0;
m_palette = 0;
imageOK = FALSE;
}
@ -91,7 +91,7 @@ wxPNGReader::wxPNGReader ( char* ImageFileName )
Width = 0; Height = 0; // Dimensions
Depth = 0; // (bits x pixel)
ColorType = 0; // Bit 1 = Palette used
ColorType = 0; // Bit 1 = m_palette used
// Bit 2 = Color used
// Bit 3 = Alpha used
@ -99,7 +99,7 @@ wxPNGReader::wxPNGReader ( char* ImageFileName )
lpbi = NULL;
bgindex = -1;
Palette = 0;
m_palette = 0;
imageOK = ReadFile (ImageFileName);
}
@ -109,10 +109,10 @@ wxPNGReader::Create(int width, int height, int depth, int colortype)
{
Width = width; Height = height; Depth = depth;
ColorType = (colortype>=0) ? colortype: ((Depth>8) ? COLORTYPE_COLOR: 0);
delete Palette;
delete m_palette;
delete[] RawImage ;
RawImage = 0;
Palette = 0;
m_palette = 0;
if (lpbi)
{
@ -137,7 +137,7 @@ wxPNGReader::~wxPNGReader ( )
if (lpbi) {
wxMacDestroyGWorld( lpbi ) ;
}
delete Palette;
delete m_palette;
}
@ -154,10 +154,10 @@ bool wxPNGReader::GetRGB(int x, int y, byte* r, byte* g, byte* b)
{
if (!Inside(x, y)) return FALSE;
if (Palette) {
return Palette->GetRGB(GetIndex(x, y), r, g, b);
if (m_palette) {
return m_palette->GetRGB(GetIndex(x, y), r, g, b);
/* PALETTEENTRY entry;
::GetPaletteEntries((HPALETTE) Palette->GetHPALETTE(), GetIndex(x, y), 1, &entry);
::GetPaletteEntries((HPALETTE) m_palette->GetHPALETTE(), GetIndex(x, y), 1, &entry);
*r = entry.peRed;
*g = entry.peGreen;
*b = entry.peBlue; */
@ -187,8 +187,8 @@ bool wxPNGReader::SetRGB(int x, int y, byte r, byte g, byte b)
if (ColorType & COLORTYPE_PALETTE)
{
if (!Palette) return FALSE;
SetIndex(x, y, Palette->GetPixel(r, g, b));
if (!m_palette) return FALSE;
SetIndex(x, y, m_palette->GetPixel(r, g, b));
} else {
ImagePointerType ImagePointer = RawImage + EfeWidth*y + (x*Depth >> 3);
@ -202,37 +202,37 @@ bool wxPNGReader::SetRGB(int x, int y, byte r, byte g, byte b)
bool wxPNGReader::SetPalette(wxPalette* colourmap)
{
delete Palette ;
delete m_palette ;
if (!colourmap)
return FALSE;
ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR);
Palette = new wxPalette( *colourmap );
m_palette = new wxPalette( *colourmap );
return true ;
// return (DibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
// return (DibSetUsage(lpbi, (HPALETTE) m_palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
}
bool
wxPNGReader::SetPalette(int n, byte *r, byte *g, byte *b)
{
delete Palette ;
Palette = new wxPalette();
if (!Palette)
delete m_palette ;
m_palette = new wxPalette();
if (!m_palette)
return FALSE;
if (!g) g = r;
if (!b) b = g;
Palette->Create(n, r, g, b);
m_palette->Create(n, r, g, b);
ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR);
return true ;
// return (DibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
// return (DibSetUsage(lpbi, (HPALETTE) m_palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
}
bool
wxPNGReader::SetPalette(int n, rgb_color_struct *rgb_struct)
{
delete Palette ;
Palette = new wxPalette();
if (!Palette)
delete m_palette ;
m_palette = new wxPalette();
if (!m_palette)
return FALSE;
byte r[256], g[256], b[256];
@ -249,10 +249,10 @@ wxPNGReader::SetPalette(int n, rgb_color_struct *rgb_struct)
if (bgindex != -1)
r[bgindex] = g[bgindex] = b[bgindex] = 0;
Palette->Create(n, r, g, b);
m_palette->Create(n, r, g, b);
ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR);
return true ;
// return (DibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
// return (DibSetUsage(lpbi, (HPALETTE) m_palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
}
void wxPNGReader::NullData()
@ -260,9 +260,9 @@ void wxPNGReader::NullData()
if (lpbi) {
wxMacDestroyGWorld( lpbi ) ;
}
delete Palette;
delete m_palette;
lpbi = NULL;
Palette = NULL;
m_palette = NULL;
}
wxBitmap* wxPNGReader::GetBitmap(void)
@ -285,8 +285,8 @@ bool wxPNGReader::InstantiateBitmap(wxBitmap *bitmap)
bitmap->SetWidth(GetWidth());
bitmap->SetHeight(GetHeight());
bitmap->SetDepth(GetDepth());
if ( GetDepth() > 1 && Palette )
bitmap->SetPalette(*Palette);
if ( GetDepth() > 1 && m_palette )
bitmap->SetPalette(*m_palette);
bitmap->SetOk(TRUE);
@ -317,9 +317,9 @@ bool wxPNGReader::InstantiateBitmap(wxBitmap *bitmap)
ReleaseDC(NULL, dc2);
HBITMAP oldBitmap = (HBITMAP) ::SelectObject(dc, tmpBitmap);
if ( Palette )
if ( m_palette )
{
HPALETTE oldPal = ::SelectPalette(dc, (HPALETTE) Palette->GetHPALETTE(), FALSE);
HPALETTE oldPal = ::SelectPalette(dc, (HPALETTE) m_palette->GetHPALETTE(), FALSE);
::RealizePalette(dc);
}
@ -337,8 +337,8 @@ bool wxPNGReader::InstantiateBitmap(wxBitmap *bitmap)
bitmap->SetWidth(GetWidth());
bitmap->SetHeight(GetHeight());
bitmap->SetDepth(GetDepth());
if ( GetDepth() > 1 && Palette )
bitmap->SetPalette(*Palette);
if ( GetDepth() > 1 && m_palette )
bitmap->SetPalette(*m_palette);
bitmap->SetOk(TRUE);

15
src/mac/window.cpp
View File

@ -689,16 +689,18 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
MacRepositionScrollBars() ;
if ( doMove )
{
wxMoveEvent event(wxPoint(m_x, m_y), m_windowId);
wxPoint point(m_x, m_y);
wxMoveEvent event(point, m_windowId);
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event) ;
}
if ( doResize )
{
MacRepositionScrollBars() ;
wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
MacRepositionScrollBars() ;
wxSize size(m_width, m_height);
wxSizeEvent event(size, m_windowId);
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
}
}
}
@ -757,7 +759,8 @@ bool wxWindow::Show(bool show)
UMASelectWindow( m_macWindowData->m_macWindow ) ;
// no need to generate events here, they will get them triggered by macos
// actually they should be , but apparently they are not
wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
wxSize size(m_width, m_height);
wxSizeEvent event(size, m_windowId);
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
}