projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compilation fixes - wxGTK compiles but not links
[wxWidgets.git]
/
src
/
os2
/
statbmp.cpp
diff --git
a/src/os2/statbmp.cpp
b/src/os2/statbmp.cpp
index a04f0547cd49261ceea2bfa3fe6b8e4bf0e7009c..2581c2285481354de83c6add659f7e2c5d6fcdc4 100644
(file)
--- a/
src/os2/statbmp.cpp
+++ b/
src/os2/statbmp.cpp
@@
-9,6
+9,10
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+#ifdef __GNUG__
+#pragma implementation "statbmp.h"
+#endif
+
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-26,9
+30,7
@@
// macors
// ---------------------------------------------------------------------------
// macors
// ---------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-#endif
// ---------------------------------------------------------------------------
// wxStaticBitmap
// ---------------------------------------------------------------------------
// wxStaticBitmap
@@
-47,22
+49,23
@@
bool wxStaticBitmap::Create(
Init();
SetName(rName);
Init();
SetName(rName);
- if (pParent) parent->AddChild(this);
+ if (pParent)
+ pParent->AddChild(this);
- m_backgroundColour = parent->GetBackgroundColour() ;
- m_foregroundColour = parent->GetForegroundColour() ;
+ m_backgroundColour = p
P
arent->GetBackgroundColour() ;
+ m_foregroundColour = p
P
arent->GetForegroundColour() ;
- if (
id == -1
)
+ if (
nId == -1
)
m_windowId = (int)NewControlId();
else
m_windowId = nId;
m_windowStyle = lStyle;
m_windowId = (int)NewControlId();
else
m_windowId = nId;
m_windowStyle = lStyle;
- int nX=
p
os.x;
- int nY =
p
os.y;
- int nWidth =
s
ize.x;
- int nHeight =
s
ize.y;
+ int nX=
rP
os.x;
+ int nY =
rP
os.y;
+ int nWidth =
rS
ize.x;
+ int nHeight =
rS
ize.y;
m_windowStyle = lStyle;
m_windowStyle = lStyle;
@@
-70,9
+73,9
@@
bool wxStaticBitmap::Create(
// TODO: create static bitmap control
const wxChar* zClassname = wxT("WX_STATIC");
// TODO: create static bitmap control
const wxChar* zClassname = wxT("WX_STATIC");
- int nWinstyle ? SS_ICON : SS_BITMAP;
+ int nWinstyle
= m_bIsIcon
? SS_ICON : SS_BITMAP;
- m_hWnd = (WX
WH
ND)::WinCreateWindow( pParent->GetHWND()
+ m_hWnd = (WX
HW
ND)::WinCreateWindow( pParent->GetHWND()
,zClassname
,wxT("")
,nWinstyle | WS_VISIBLE
,zClassname
,wxT("")
,nWinstyle | WS_VISIBLE
@@
-97,7
+100,7
@@
bool wxStaticBitmap::Create(
bool wxStaticBitmap::ImageIsOk() const
{
bool wxStaticBitmap::ImageIsOk() const
{
- return(m_pImage
**
m_pImage->Ok());
+ return(m_pImage
&&
m_pImage->Ok());
}
void wxStaticBitmap::Free()
}
void wxStaticBitmap::Free()
@@
-131,7
+134,7
@@
void wxStaticBitmap::SetImage(
int nH;
GetPosition(&nX, &nY);
int nH;
GetPosition(&nX, &nY);
- GetSize(&nW, &nH
h
);
+ GetSize(&nW, &nH);
::WinSendMsg( GetHwnd()
,SM_SETHANDLE
::WinSendMsg( GetHwnd()
,SM_SETHANDLE