From b6f4144e596cdf8e862e513b7f7c09022a664137 Mon Sep 17 00:00:00 2001 From: David Webster Date: Mon, 8 Jul 2002 03:38:01 +0000 Subject: [PATCH] no message git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/os2/bitmap.h | 25 +++++++++++++++++------- include/wx/os2/gdiimage.h | 8 +++++++- include/wx/os2/toolbar.h | 41 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 8 deletions(-) diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h index 68efa96758..10f0464f38 100644 --- a/include/wx/os2/bitmap.h +++ b/include/wx/os2/bitmap.h @@ -87,11 +87,16 @@ public: wxBitmap(const char** ppData) { CreateFromXpm(ppData); } wxBitmap(char** ppData) { CreateFromXpm((const char**)ppData); } - // Load a file or resource - wxBitmap( const wxString& rName + // Load a resource + wxBitmap( int nId ,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 wxBitmap( void* pData ,long lType @@ -157,7 +162,7 @@ public: ,int nHeight ,int nDepth = 1 ); - virtual bool LoadFile( const wxString& rName + virtual bool LoadFile( int nId ,long lType = wxBITMAP_TYPE_BMP_RESOURCE ); virtual bool SaveFile( const wxString& rName @@ -323,8 +328,7 @@ public: ,int nDepth = 1 ); virtual bool LoadFile( wxBitmap* pBitmap - ,const wxString& rName - ,HPS hPs + ,int nId ,long lFlags ,int nDesiredWidth ,int nDesiredHeight @@ -343,8 +347,7 @@ public: ,int nDepth = 1 ); virtual bool Load( wxGDIImage* pImage - ,const wxString& rName - ,HPS hPs + ,int nId ,long lFlags ,int nDesiredWidth ,int nDesiredHeight @@ -354,6 +357,14 @@ public: ,int lType ); private: + inline virtual bool Load( wxGDIImage* pImage + ,const wxString& rName + ,HPS hPs + ,long lFlags + ,int nDesiredWidth + ,int nDesiredHeight + ) + { return FALSE; } DECLARE_DYNAMIC_CLASS(wxBitmapHandler) }; // end of CLASS wxBitmapHandler diff --git a/include/wx/os2/gdiimage.h b/include/wx/os2/gdiimage.h index 18a301cef5..d2fd412100 100644 --- a/include/wx/os2/gdiimage.h +++ b/include/wx/os2/gdiimage.h @@ -133,6 +133,12 @@ public: ,int nDesiredWidth ,int nDesiredHeight ) = 0; + virtual bool Load( wxGDIImage* pImage + ,int nId + ,long lFlags + ,int nDesiredWidth + ,int nDesiredHeight + ) = 0; virtual bool Save( wxGDIImage* pImage ,const wxString& rName ,int lType @@ -142,7 +148,7 @@ protected: wxString m_sName; wxString m_sExtension; long m_lType; -}; +}; // end of wxGDIImageHandler // ---------------------------------------------------------------------------- // wxGDIImage: this class supports GDI image handlers which may be registered diff --git a/include/wx/os2/toolbar.h b/include/wx/os2/toolbar.h index 5b3fb460c8..8cad6a95c7 100644 --- a/include/wx/os2/toolbar.h +++ b/include/wx/os2/toolbar.h @@ -61,6 +61,47 @@ public: virtual bool Realize(void); 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 // -- 2.47.2