Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some os/2 icon-bitmap fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
1999-12-06 05:01:46 +00:00
parent 58b1642453
commit 43543d985b
13 changed files with 202 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/os2/app.h
View File

@@ -22,7 +22,7 @@ class WXDLLEXPORT wxKeyEvent;
class WXDLLEXPORT wxLog;
WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
HAB vHabmain;
WXDLLEXPORT_DATA(extern HAB) vHabmain;
// Force an exit from main loop
void WXDLLEXPORT wxExit(void);

3
include/wx/os2/bitmap.h
View File

@@ -272,6 +272,9 @@ public:
protected:
WXHBITMAP m_hMaskBitmap;
DECLARE_DYNAMIC_CLASS(wxMask)
private:
HDC m_hDc;
HPS m_hPs;
};
// ----------------------------------------------------------------------------

28
include/wx/os2/pnghand.h
View File

@@ -18,18 +18,26 @@
class WXDLLEXPORT wxPNGFileHandler: public wxBitmapHandler
{
DECLARE_DYNAMIC_CLASS(wxPNGFileHandler)
DECLARE_DYNAMIC_CLASS(wxPNGFileHandler)
public:
inline wxPNGFileHandler(void)
{
m_name = "PNG bitmap file";
m_extension = "bmp";
m_type = wxBITMAP_TYPE_PNG;
};
inline wxPNGFileHandler(void)
{
m_sName = "PNG bitmap file";
m_sExtension = "bmp";
m_lType = wxBITMAP_TYPE_PNG;
};
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);
virtual bool LoadFile( wxBitmap* pBitmap
,const wxString& rName
,long lFlags
,int nDesiredWidth
,int nDesiredHeight
);
virtual bool SaveFile( wxBitmap* pBitmap
,const wxString& rName
,int nType
,const wxPalette* pPalette = NULL
);
};
#endif