post wxUniv merge fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -197,10 +197,10 @@ void wxTabbedWindow::SizeTabs(int x,int y, int width, int height, bool repant)
|
|||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------
|
//---------------------------------------------------------------------------
|
||||||
void wxTabbedWindow::AddTab( wxWindow* pContent,
|
void wxTabbedWindow::AddTab( wxWindow* pContent,
|
||||||
wxString tabText,
|
wxString tabText,
|
||||||
wxString imageFileName,
|
wxString imageFileName,
|
||||||
long imageType )
|
wxBitmapType imageType )
|
||||||
{
|
{
|
||||||
twTabInfo* pTab = new twTabInfo();
|
twTabInfo* pTab = new twTabInfo();
|
||||||
|
|
||||||
|
@@ -100,10 +100,10 @@ public:
|
|||||||
// tabs can be also added when the window is
|
// tabs can be also added when the window is
|
||||||
// already displayed - "on the fly"
|
// already displayed - "on the fly"
|
||||||
|
|
||||||
virtual void AddTab( wxWindow* pContent, // contained window
|
virtual void AddTab( wxWindow* pContent, // contained window
|
||||||
wxString tabText, // tab label
|
wxString tabText, // tab label
|
||||||
wxString imageFileName = "", // if "", only text label is displayed
|
wxString imageFileName = "", // if "", only text label is displayed
|
||||||
long imageType = wxBITMAP_TYPE_BMP );
|
wxBitmapType imageType = wxBITMAP_TYPE_BMP );
|
||||||
|
|
||||||
// NOTE:: if this AddTab(..) overload is called, the
|
// NOTE:: if this AddTab(..) overload is called, the
|
||||||
// image bitmap will not be serialized (if performed),
|
// image bitmap will not be serialized (if performed),
|
||||||
|
Reference in New Issue
Block a user