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

More framework fixes and fixes for building dlls.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-03-09 21:06:48 +00:00
parent b0a0942105
commit 9add53a470
3 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,12 @@ public:
} }
// accessors // accessors
bool IsOk() const { return m_hHandle != 0; } bool IsOk() const
{
if (m_hHandle == 0)
return FALSE;
return TRUE;
}
void SetSize( int nW void SetSize( int nW
,int nH ,int nH
@@ -55,7 +60,7 @@ public:
{ m_nWidth = nW; m_nHeight = nH; } { m_nWidth = nW; m_nHeight = nH; }
// free the ressources we allocated // free the ressources we allocated
virtual void Free() = 0; virtual void Free() { };
// for compatibility, the member fields are public // for compatibility, the member fields are public
@@ -170,9 +175,23 @@ public:
// accessors // accessors
WXHANDLE GetHandle() const WXHANDLE GetHandle() const
{ return IsNull() ? 0 : GetGDIImageData()->m_hHandle; } {
wxGDIImageRefData* pData;
pData = GetGDIImageData();
if (!pData)
return 0;
else
return pData->m_hHandle;
}
void SetHandle(WXHANDLE hHandle) void SetHandle(WXHANDLE hHandle)
{ EnsureHasData(); GetGDIImageData()->m_hHandle = hHandle; } {
wxGDIImageRefData* pData;
EnsureHasData();
pData = GetGDIImageData();
pData->m_hHandle = hHandle;
}
bool Ok() const { return GetHandle() != 0; } bool Ok() const { return GetHandle() != 0; }

2
include/wx/os2/icon.h
View File

@@ -73,7 +73,7 @@ public:
); );
inline wxIcon& operator = (const wxIcon& rIcon) inline wxIcon& operator = (const wxIcon& rIcon)
{ if (*this == rIcon) Ref(rIcon); return *this; } { if (*this != rIcon) Ref(rIcon); return *this; }
inline bool operator == (const wxIcon& rIcon) inline bool operator == (const wxIcon& rIcon)
{ return m_refData == rIcon.m_refData; } { return m_refData == rIcon.m_refData; }
inline bool operator != (const wxIcon& rIcon) inline bool operator != (const wxIcon& rIcon)

4
include/wx/os2/notebook.h
View File

@@ -28,7 +28,7 @@ class WXDLLEXPORT wxWindow;
// array of notebook pages // array of notebook pages
typedef wxWindow WXDLLEXPORT wxNotebookPage; // so far, any window can be a page typedef wxWindow WXDLLEXPORT wxNotebookPage; // so far, any window can be a page
WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages); WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayNBPages);
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxNotebook // wxNotebook
@@ -151,7 +151,7 @@ protected:
void ChangePage(int nOldSel, int nSel); // change pages void ChangePage(int nOldSel, int nSel); // change pages
wxImageList *m_pImageList; // we can have an associated image list wxImageList *m_pImageList; // we can have an associated image list
wxArrayPages m_aPages; // array of pages wxArrayNBPages m_aPages; // array of pages
int m_nSelection; // the current selection (-1 if none) int m_nSelection; // the current selection (-1 if none)