projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
corrected #ifdef order (might help linking with wxUSE_MEMORY_TRACING==1)
[wxWidgets.git]
/
src
/
os2
/
spinbutt.cpp
diff --git
a/src/os2/spinbutt.cpp
b/src/os2/spinbutt.cpp
index 2103d2c98b9ae1008919245bde557f72dc64613f..28661af11a3393538f3e96aa523fc0bbfdc3a97b 100644
(file)
--- a/
src/os2/spinbutt.cpp
+++ b/
src/os2/spinbutt.cpp
@@
-9,11
+9,6
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
- #pragma implementation "spinbutt.h"
- #pragma implementation "spinbutbase.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"
@@
-32,7
+27,6
@@
extern void wxAssociateWinWithHandle( HWND hWnd
,wxWindowOS2* pWin
);
extern void wxAssociateWinWithHandle( HWND hWnd
,wxWindowOS2* pWin
);
-static WXFARPROC fnWndProcSpinCtrl = (WXFARPROC)NULL;
IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
@@
-102,15
+96,6
@@
bool wxSpinButton::Create(
if (m_windowStyle & wxCLIP_SIBLINGS )
lSstyle |= WS_CLIPSIBLINGS;
if (m_windowStyle & wxCLIP_SIBLINGS )
lSstyle |= WS_CLIPSIBLINGS;
- SPBCDATA vCtrlData;
-
- vCtrlData.cbSize = sizeof(SPBCDATA);
- vCtrlData.ulTextLimit = 10L;
- vCtrlData.lLowerLimit = 0L;
- vCtrlData.lUpperLimit = 100L;
- vCtrlData.idMasterSpb = vId;
- vCtrlData.pHWXCtlData = NULL;
-
m_hWnd = (WXHWND)::WinCreateWindow( GetWinHwnd(pParent)
,WC_SPINBUTTON
,(PSZ)NULL
m_hWnd = (WXHWND)::WinCreateWindow( GetWinHwnd(pParent)
,WC_SPINBUTTON
,(PSZ)NULL
@@
-119,13
+104,14
@@
bool wxSpinButton::Create(
,GetWinHwnd(pParent)
,HWND_TOP
,(HMENU)vId
,GetWinHwnd(pParent)
,HWND_TOP
,(HMENU)vId
- ,
(PVOID)&vCtrlData
+ ,
NULL
,NULL
);
if (m_hWnd == 0)
{
return FALSE;
}
,NULL
);
if (m_hWnd == 0)
{
return FALSE;
}
+ SetRange(m_min, m_max);
if(pParent)
pParent->AddChild((wxSpinButton *)this);
if(pParent)
pParent->AddChild((wxSpinButton *)this);
@@
-150,8
+136,13
@@
bool wxSpinButton::Create(
wxAssociateWinWithHandle( m_hWnd
,(wxWindowOS2*)this
);
wxAssociateWinWithHandle( m_hWnd
,(wxWindowOS2*)this
);
+#if 0
+ // FIXME:
+ // Apparently, this does not work, as it crashes in setvalue/setrange calls
+ // What's it supposed to do anyway?
::WinSetWindowULong(GetHwnd(), QWL_USER, (LONG)this);
fnWndProcSpinCtrl = (WXFARPROC)::WinSubclassWindow(m_hWnd, (PFNWP)wxSpinCtrlWndProc);
::WinSetWindowULong(GetHwnd(), QWL_USER, (LONG)this);
fnWndProcSpinCtrl = (WXFARPROC)::WinSubclassWindow(m_hWnd, (PFNWP)wxSpinCtrlWndProc);
+#endif
delete pTextFont;
return TRUE;
} // end of wxSpinButton::Create
delete pTextFont;
return TRUE;
} // end of wxSpinButton::Create
@@
-167,10
+158,12
@@
wxSpinButton::~wxSpinButton()
wxSize wxSpinButton::DoGetBestSize() const
{
//
wxSize wxSpinButton::DoGetBestSize() const
{
//
- // OS/2 PM does not really have system metrics so we'll just set our best guess
+ // OS/2 PM does not really have system metrics so we'll just set it to
+ // 24x20 which is the size of the buttons and the borders.
// Also we have no horizontal spin buttons.
//
// Also we have no horizontal spin buttons.
//
- return (wxSize(10,20));
+ wxSize best(24,20);
+ return best;
} // end of wxSpinButton::DoGetBestSize
// ----------------------------------------------------------------------------
} // end of wxSpinButton::DoGetBestSize
// ----------------------------------------------------------------------------
@@
-179,7
+172,6
@@
wxSize wxSpinButton::DoGetBestSize() const
int wxSpinButton::GetValue() const
{
int wxSpinButton::GetValue() const
{
- int nVal = 0;
long lVal = 0L;
char zVal[10];
long lVal = 0L;
char zVal[10];
@@
-194,31
+186,25
@@
int wxSpinButton::GetValue() const
return ((int)lVal);
} // end of wxSpinButton::GetValue
return ((int)lVal);
} // end of wxSpinButton::GetValue
-bool wxSpinButton::OS2OnScroll(
- int nOrientation
-, WXWORD wParam
-, WXWORD wPos
-, WXHWND hControl
-)
+bool wxSpinButton::OS2OnScroll( int WXUNUSED(nOrientation),
+ WXWORD WXUNUSED(wParam),
+ WXWORD wPos,
+ WXHWND hControl )
{
{
- wxCHECK_MSG(hControl,
FALSE
, wxT("scrolling what?") )
+ wxCHECK_MSG(hControl,
false
, wxT("scrolling what?") )
- wxSpinEvent vEvent( wxEVT_SCROLL_THUMBTRACK
- ,m_windowId
- );
- int nVal = (int)wPos; // cast is important for negative values!
+ wxSpinEvent vEvent( wxEVT_SCROLL_THUMBTRACK, m_windowId );
+ int nVal = (int)wPos; // cast is important for negative values!
vEvent.SetPosition(nVal);
vEvent.SetEventObject(this);
return(GetEventHandler()->ProcessEvent(vEvent));
} // end of wxSpinButton::OS2OnScroll
vEvent.SetPosition(nVal);
vEvent.SetEventObject(this);
return(GetEventHandler()->ProcessEvent(vEvent));
} // end of wxSpinButton::OS2OnScroll
-bool wxSpinButton::OS2Command(
- WXUINT uCmd
-, WXWORD wId
-)
+bool wxSpinButton::OS2Command( WXUINT WXUNUSED(uCmd),
+ WXWORD WXUNUSED(wId) )
{
{
- return
FALSE
;
+ return
false
;
} // end of wxSpinButton::OS2Command
void wxSpinButton::SetRange(
} // end of wxSpinButton::OS2Command
void wxSpinButton::SetRange(