projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prefix implementation methods of wxBitmapButton with 'GTK' to prevent shadowing of...
[wxWidgets.git]
/
src
/
os2
/
button.cpp
diff --git
a/src/os2/button.cpp
b/src/os2/button.cpp
index 150685d88e693a16098b161543b9ad9b4f3da0f4..41fa9c9cbc19ab5b7ced118f03c7480482e3ab28 100644
(file)
--- a/
src/os2/button.cpp
+++ b/
src/os2/button.cpp
@@
-1,28
+1,31
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: button.cpp
+// Name:
src/os2/
button.cpp
// Purpose: wxButton
// Author: David Webster
// Modified by:
// Created: 10/13/99
// RCS-ID: $Id$
// Copyright: (c) David Webster
// Purpose: wxButton
// Author: David Webster
// Modified by:
// Created: 10/13/99
// RCS-ID: $Id$
// Copyright: (c) David Webster
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
+#include "wx/button.h"
+
#ifndef WX_PRECOMP
#include "wx/app.h"
#ifndef WX_PRECOMP
#include "wx/app.h"
- #include "wx/button.h"
#include "wx/brush.h"
#include "wx/panel.h"
#include "wx/bmpbuttn.h"
#include "wx/settings.h"
#include "wx/dcscreen.h"
#include "wx/scrolwin.h"
#include "wx/brush.h"
#include "wx/panel.h"
#include "wx/bmpbuttn.h"
#include "wx/settings.h"
#include "wx/dcscreen.h"
#include "wx/scrolwin.h"
+ #include "wx/toplevel.h"
#endif
#endif
+#include "wx/stockitem.h"
#include "wx/os2/private.h"
#define BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cy) (11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)/10)
#include "wx/os2/private.h"
#define BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cy) (11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)/10)
@@
-40,17
+43,18
@@
IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
// Button
// Button
-bool wxButton::Create(
- wxWindow* pParent
-, wxWindowID vId
-, const wxString& rsLabel
-, const wxPoint& rPos
-, const wxSize& rSize
-, long lStyle
-, const wxValidator& rValidator
-, const wxString& rsName
-)
+bool wxButton::Create( wxWindow* pParent,
+ wxWindowID vId,
+ const wxString& rsLbl,
+ const wxPoint& rPos,
+ const wxSize& rSize,
+ long lStyle,
+ const wxValidator& rValidator,
+ const wxString& rsName)
{
{
+ wxString rsLabel(rsLbl);
+ if (rsLabel.empty() && wxIsStockID(vId))
+ rsLabel = wxGetStockLabel(vId);
wxString sLabel = ::wxPMTextToLabel(rsLabel);
wxString sLabel = ::wxPMTextToLabel(rsLabel);
@@
-76,7
+80,7
@@
bool wxButton::Create(
m_hWnd = (WXHWND)::WinCreateWindow( GetHwndOf(pParent) // Parent handle
,WC_BUTTON // A Button class window
m_hWnd = (WXHWND)::WinCreateWindow( GetHwndOf(pParent) // Parent handle
,WC_BUTTON // A Button class window
- ,
(PSZ)
sLabel.c_str() // Button text
+ ,sLabel.c_str() // Button text
,lStyle // Button style
,0, 0, 0, 0 // Location and size
,GetHwndOf(pParent) // Owner handle
,lStyle // Button style
,0, 0, 0, 0 // Location and size
,GetHwndOf(pParent) // Owner handle
@@
-87,7
+91,7
@@
bool wxButton::Create(
);
if (m_hWnd == 0)
{
);
if (m_hWnd == 0)
{
- return
FALSE
;
+ return
false
;
}
//
}
//
@@
-108,21
+112,21
@@
bool wxButton::Create(
,rSize.y
);
delete pButtonFont;
,rSize.y
);
delete pButtonFont;
- return
TRUE
;
+ return
true
;
} // end of wxButton::Create
wxButton::~wxButton()
{
} // end of wxButton::Create
wxButton::~wxButton()
{
- wx
Panel* pPanel = wxDynamicCast(GetParent(), wxPanel
);
+ wx
TopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow
);
- if (
pPanel
)
+ if (
tlw
)
{
{
- if (
pPanel
->GetDefaultItem() == this)
+ if (
tlw
->GetDefaultItem() == this)
{
//
// Don't leave the panel with invalid default item
//
{
//
// Don't leave the panel with invalid default item
//
-
pPanel
->SetDefaultItem(NULL);
+
tlw
->SetDefaultItem(NULL);
}
}
} // end of wxButton::~wxButton
}
}
} // end of wxButton::~wxButton
@@
-137,6
+141,7
@@
wxSize wxButton::DoGetBestSize() const
int nWidthButton;
int nWidthChar;
int nHeightChar;
int nWidthButton;
int nWidthChar;
int nHeightChar;
+ wxFont vFont = (wxFont)GetFont();
GetTextExtent( rsLabel
,&nWidthButton
GetTextExtent( rsLabel
,&nWidthButton
@@
-146,7
+151,7
@@
wxSize wxButton::DoGetBestSize() const
wxGetCharSize( GetHWND()
,&nWidthChar
,&nHeightChar
wxGetCharSize( GetHWND()
,&nWidthChar
,&nHeightChar
- ,
(wxFont*)&GetFont()
+ ,
&vFont
);
//
);
//
@@
-226,58
+231,44
@@
bool wxButton::SendClickEvent()
return ProcessCommand(vEvent);
} // end of wxButton::SendClickEvent
return ProcessCommand(vEvent);
} // end of wxButton::SendClickEvent
-
void
wxButton::SetDefault()
+
wxWindow *
wxButton::SetDefault()
{
{
- wxWindow* pParent = GetParent();
-
- wxCHECK_RET( pParent, _T("button without parent?") );
-
//
// Set this one as the default button both for wxWidgets and Windows
//
//
// Set this one as the default button both for wxWidgets and Windows
//
- wxWindow* pWinOldDefault = pParent->SetDefaultItem(this);
-
- SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton)
- ,FALSE
- );
- SetDefaultStyle( this
- ,TRUE
- );
+ wxWindow* pWinOldDefault = wxButtonBase::SetDefault();
+
+ SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton), false);
+ SetDefaultStyle( this, true );
+
+ return pWinOldDefault;
} // end of wxButton::SetDefault
void wxButton::SetTmpDefault()
{
} // end of wxButton::SetDefault
void wxButton::SetTmpDefault()
{
- wx
Window* pParent = GetParent(
);
+ wx
TopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow
);
- wxCHECK_RET(
pParent, _T("button without parent
?") );
+ wxCHECK_RET(
tlw, _T("button without top level window
?") );
- wxWindow* pWinOldDefault =
pParent
->GetDefaultItem();
+ wxWindow* pWinOldDefault =
tlw
->GetDefaultItem();
- pParent->SetTmpDefaultItem(this);
- SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton)
- ,FALSE
- );
- SetDefaultStyle( this
- ,TRUE
- );
+ tlw->SetTmpDefaultItem(this);
+ SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton), false);
+ SetDefaultStyle( this, true );
} // end of wxButton::SetTmpDefault
void wxButton::UnsetTmpDefault()
{
} // end of wxButton::SetTmpDefault
void wxButton::UnsetTmpDefault()
{
- wx
Window* pParent = GetParent(
);
+ wx
TopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow
);
- wxCHECK_RET(
pParent, _T("button without parent
?") );
+ wxCHECK_RET(
tlw, _T("button without top level window
?") );
-
pParent
->SetTmpDefaultItem(NULL);
+
tlw
->SetTmpDefaultItem(NULL);
- wxWindow* pWinOldDefault =
pParent
->GetDefaultItem();
+ wxWindow* pWinOldDefault =
tlw
->GetDefaultItem();
- SetDefaultStyle( this
- ,FALSE
- );
- SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton)
- ,TRUE
- );
+ SetDefaultStyle( this, false );
+ SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton), true );
} // end of wxButton::UnsetTmpDefault
void wxButton::SetDefaultStyle(
} // end of wxButton::UnsetTmpDefault
void wxButton::SetDefaultStyle(
@@
-334,12
+325,9
@@
void wxButton::SetDefaultStyle(
// event/message handlers
// ----------------------------------------------------------------------------
// event/message handlers
// ----------------------------------------------------------------------------
-bool wxButton::OS2Command(
- WXUINT uParam
-, WXWORD wId
-)
+bool wxButton::OS2Command(WXUINT uParam, WXWORD WXUNUSED(wId))
{
{
- bool
bProcessed = FALSE
;
+ bool
bProcessed = false
;
switch (uParam)
{
switch (uParam)
{
@@
-348,21
+336,20
@@
bool wxButton::OS2Command(
bProcessed = SendClickEvent();
break;
}
bProcessed = SendClickEvent();
break;
}
+
return bProcessed;
} // end of wxButton::OS2Command
return bProcessed;
} // end of wxButton::OS2Command
-WXHBRUSH wxButton::OnCtlColor(
- WXHDC pDC
-, WXHWND pWnd
-, WXUINT nCtlColor
-, WXUINT uMessage
-, WXWPARAM wParam
-, WXLPARAM lParam
-)
+WXHBRUSH wxButton::OnCtlColor( WXHDC WXUNUSED(pDC),
+ WXHWND WXUNUSED(pWnd),
+ WXUINT WXUNUSED(nCtlColor),
+ WXUINT WXUNUSED(uMessage),
+ WXWPARAM WXUNUSED(wParam),
+ WXLPARAM WXUNUSED(lParam) )
{
{
- wxBrush*
pBackgroundBrush = wxTheBrushList->FindOrCreateBrush( GetBackgroundColour()
-
,wxSOLID
-
);
+ wxBrush* pBackgroundBrush = wxTheBrushList->FindOrCreateBrush( GetBackgroundColour()
+ ,wxSOLID
+ );
return (WXHBRUSH)pBackgroundBrush->GetResourceHandle();
} // end of wxButton::OnCtlColor
return (WXHBRUSH)pBackgroundBrush->GetResourceHandle();
} // end of wxButton::OnCtlColor
@@
-403,11
+390,9
@@
WXDWORD wxButton::OS2GetStyle(
return dwStyle;
} // end of wxButton::OS2GetStyle
return dwStyle;
} // end of wxButton::OS2GetStyle
-MRESULT wxButton::WindowProc(
- WXUINT uMsg
-, WXWPARAM wParam
-, WXLPARAM lParam
-)
+MRESULT wxButton::WindowProc( WXUINT uMsg,
+ WXWPARAM wParam,
+ WXLPARAM lParam )
{
//
// When we receive focus, we want to temporary become the default button in
{
//
// When we receive focus, we want to temporary become the default button in
@@
-450,4
+435,3
@@
MRESULT wxButton::WindowProc(
,lParam
));
} // end of wxWindowProc
,lParam
));
} // end of wxWindowProc
-