Added install scripts in missing places
Fixed wxFrame resize behaviour for GTK 1.1.3 Added GetMousePosition Added const char** constructors to icon and bitmap Autolayout should now work for wxDialog git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -19,8 +19,13 @@
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxIcon,wxBitmap)
|
||||
|
||||
wxIcon::wxIcon( const char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
|
||||
wxBitmap( bits )
|
||||
{
|
||||
}
|
||||
|
||||
wxIcon::wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
|
||||
wxBitmap( bits )
|
||||
wxBitmap( bits )
|
||||
{
|
||||
}
|
||||
|
||||
@@ -28,20 +33,20 @@ wxIcon::wxIcon() : wxBitmap()
|
||||
{
|
||||
}
|
||||
|
||||
wxIcon::wxIcon(const wxIcon& icon) : wxBitmap()
|
||||
wxIcon::wxIcon( const wxIcon& icon ) : wxBitmap()
|
||||
{
|
||||
Ref(icon);
|
||||
Ref(icon);
|
||||
}
|
||||
|
||||
wxIcon::wxIcon(const wxIcon* icon) : wxBitmap()
|
||||
wxIcon::wxIcon( const wxIcon* icon ) : wxBitmap()
|
||||
{
|
||||
if (icon) Ref(*icon);
|
||||
if (icon) Ref(*icon);
|
||||
}
|
||||
|
||||
wxIcon& wxIcon::operator = (const wxIcon& icon)
|
||||
wxIcon& wxIcon::operator = ( const wxIcon& icon )
|
||||
{
|
||||
if (*this == icon) return (*this);
|
||||
Ref(icon);
|
||||
return *this;
|
||||
if (*this == icon) return (*this);
|
||||
Ref(icon);
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user