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

compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-03-05 13:23:38 +00:00
parent 17867d61dc
commit afce4c035f
5 changed files with 834 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/generic/laywin.h
View File

@@ -9,7 +9,7 @@
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_LAYWIN_H_G_
@@ -34,7 +34,7 @@ enum wxLayoutAlignment {
wxLAYOUT_TOP,
wxLAYOUT_LEFT,
wxLAYOUT_RIGHT,
wxLAYOUT_BOTTOM,
wxLAYOUT_BOTTOM
};
// Not sure this is necessary
@@ -110,7 +110,7 @@ public:
{
SetEventType(wxEVT_CALCULATE_LAYOUT);
m_flags = 0;
m_id = id;
m_id = id;
}
// Read by the app
inline void SetFlags(int flags) { m_flags = flags; }

4
include/wx/motif/icon.h
View File

@@ -56,8 +56,8 @@ public:
bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_XPM,
int desiredWidth = -1, int desiredHeight = -1);
// bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_XBM)
// { return wxBitmap::LoadFile(name, type); }
bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_XBM)
{ return wxBitmap::LoadFile(name, type); }
inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }