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

no message

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-07-08 03:38:01 +00:00
parent 7414c52cd0
commit b6f4144e59
3 changed files with 66 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,11 +87,16 @@ public:
wxBitmap(const char** ppData) { CreateFromXpm(ppData); } wxBitmap(const char** ppData) { CreateFromXpm(ppData); }
wxBitmap(char** ppData) { CreateFromXpm((const char**)ppData); } wxBitmap(char** ppData) { CreateFromXpm((const char**)ppData); }
// Load a file or resource // Load a resource
wxBitmap( const wxString& rName wxBitmap( int nId
,long lType = wxBITMAP_TYPE_BMP_RESOURCE ,long lType = wxBITMAP_TYPE_BMP_RESOURCE
); );
// For compatiability with other ports, under OS/2 does same as default ctor
inline wxBitmap( const wxString& WXUNUSED(rFilename)
,long WXUNUSED(lType)
)
{ Init(); }
// New constructor for generalised creation from data // New constructor for generalised creation from data
wxBitmap( void* pData wxBitmap( void* pData
,long lType ,long lType
@@ -157,7 +162,7 @@ public:
,int nHeight ,int nHeight
,int nDepth = 1 ,int nDepth = 1
); );
virtual bool LoadFile( const wxString& rName virtual bool LoadFile( int nId
,long lType = wxBITMAP_TYPE_BMP_RESOURCE ,long lType = wxBITMAP_TYPE_BMP_RESOURCE
); );
virtual bool SaveFile( const wxString& rName virtual bool SaveFile( const wxString& rName
@@ -323,8 +328,7 @@ public:
,int nDepth = 1 ,int nDepth = 1
); );
virtual bool LoadFile( wxBitmap* pBitmap virtual bool LoadFile( wxBitmap* pBitmap
,const wxString& rName ,int nId
,HPS hPs
,long lFlags ,long lFlags
,int nDesiredWidth ,int nDesiredWidth
,int nDesiredHeight ,int nDesiredHeight
@@ -343,8 +347,7 @@ public:
,int nDepth = 1 ,int nDepth = 1
); );
virtual bool Load( wxGDIImage* pImage virtual bool Load( wxGDIImage* pImage
,const wxString& rName ,int nId
,HPS hPs
,long lFlags ,long lFlags
,int nDesiredWidth ,int nDesiredWidth
,int nDesiredHeight ,int nDesiredHeight
@@ -354,6 +357,14 @@ public:
,int lType ,int lType
); );
private: private:
inline virtual bool Load( wxGDIImage* pImage
,const wxString& rName
,HPS hPs
,long lFlags
,int nDesiredWidth
,int nDesiredHeight
)
{ return FALSE; }
DECLARE_DYNAMIC_CLASS(wxBitmapHandler) DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
}; // end of CLASS wxBitmapHandler }; // end of CLASS wxBitmapHandler

8
include/wx/os2/gdiimage.h
View File

@@ -133,6 +133,12 @@ public:
,int nDesiredWidth ,int nDesiredWidth
,int nDesiredHeight ,int nDesiredHeight
) = 0; ) = 0;
virtual bool Load( wxGDIImage* pImage
,int nId
,long lFlags
,int nDesiredWidth
,int nDesiredHeight
) = 0;
virtual bool Save( wxGDIImage* pImage virtual bool Save( wxGDIImage* pImage
,const wxString& rName ,const wxString& rName
,int lType ,int lType
@@ -142,7 +148,7 @@ protected:
wxString m_sName; wxString m_sName;
wxString m_sExtension; wxString m_sExtension;
long m_lType; long m_lType;
}; }; // end of wxGDIImageHandler
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxGDIImage: this class supports GDI image handlers which may be registered // wxGDIImage: this class supports GDI image handlers which may be registered

41
include/wx/os2/toolbar.h
View File

@@ -61,6 +61,47 @@ public:
virtual bool Realize(void); virtual bool Realize(void);
virtual void SetRows(int nRows); virtual void SetRows(int nRows);
//
// Special overrides for OS/2
//
virtual wxToolBarToolBase* InsertControl( size_t nPos
,wxControl* pControl
);
virtual wxToolBarToolBase* InsertSeparator(size_t nPos);
virtual wxToolBarToolBase* InsertTool( size_t nPos
,int nId
,const wxString& rsLabel
,const wxBitmap& rBitmap
,const wxBitmap& rBmpDisabled = wxNullBitmap
,wxItemKind eKind = wxITEM_NORMAL
,const wxString& rsShortHelp = wxEmptyString
,const wxString& rsLongHelp = wxEmptyString
,wxObject* pClientData = NULL
);
wxToolBarToolBase* InsertTool( size_t nPos
,int nId
,const wxBitmap& rBitmap
,const wxBitmap& rBmpDisabled = wxNullBitmap
,bool bToggle = FALSE
,wxObject* pClientData = NULL
,const wxString& rsShortHelp = wxEmptyString
,const wxString& rsLongHelp = wxEmptyString
)
{
return InsertTool( nPos
,nId
,wxEmptyString
,rBitmap
,rBmpDisabled
,bToggle ? wxITEM_CHECK : wxITEM_NORMAL
,rsShortHelp
,rsLongHelp
,pClientData
);
}
virtual bool DeleteTool(int nId);
virtual bool DeleteToolByPos(size_t nPos);
// //
// Event handlers // Event handlers
// //