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

fixed warnings after GetFont prototype change

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-24 14:25:47 +00:00
parent c6eb778541
commit 7a5e53abb3
11 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/private.h
View File

@@ -493,7 +493,7 @@ WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
extern HCURSOR wxGetCurrentBusyCursor(); // from msw/utils.cpp
extern const wxCursor *wxGetGlobalCursor(); // from msw/cursor.cpp
WXDLLEXPORT void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont *the_font);
WXDLLEXPORT void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont& the_font);
WXDLLEXPORT void wxFillLogFont(LOGFONT *logFont, const wxFont *font);
WXDLLEXPORT wxFont wxCreateFontFromLogFont(const LOGFONT *logFont);
WXDLLEXPORT wxFontEncoding wxGetFontEncFromCharSet(int charset);

2
src/msw/button.cpp
View File

@@ -203,7 +203,7 @@ wxSize wxButton::DoGetBestSize() const
GetTextExtent(wxGetWindowText(GetHWND()), &wBtn, NULL);
int wChar, hChar;
wxGetCharSize(GetHWND(), &wChar, &hChar, &GetFont());
wxGetCharSize(GetHWND(), &wChar, &hChar, GetFont());
// add a margin -- the button is wider than just its label
wBtn += 3*wChar;

2
src/msw/listbox.cpp
View File

@@ -682,7 +682,7 @@ wxSize wxListBox::DoGetBestSize() const
// the listbox should be slightly larger than the widest string
int cx, cy;
wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
wListbox += 3*cx;

4
src/msw/radiobox.cpp
View File

@@ -466,7 +466,7 @@ wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const
{
// the radiobox should be big enough for its buttons
int cx1, cy1;
wxGetCharSize(m_hWnd, &cx1, &cy1, &GetFont());
wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());
int extraHeight = cy1;
@@ -525,7 +525,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
#endif
int cx1, cy1;
wxGetCharSize(m_hWnd, &cx1, &cy1, & GetFont());
wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());
// Attempt to have a look coherent with other platforms: We compute the
// biggest toggle dim, then we align all items according this value.

4
src/msw/slider95.cpp
View File

@@ -469,7 +469,7 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
int cy;
int cyf;
wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());
wxGetCharSize(GetHWND(), &cx, &cy, this->GetFont());
if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL)
{
@@ -633,7 +633,7 @@ wxSize wxSlider95::DoGetBestSize() const
int min_len = 0;
int max_len = 0;
wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());
wxGetCharSize(GetHWND(), &cx, &cy, this->GetFont());
if ( !HasFlag(wxSL_VERTICAL))
{

2
src/msw/slidrmsw.cpp
View File

@@ -349,7 +349,7 @@ void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
int cy;
int cyf;
wxGetCharSize(GetHWND(), &cx, &cy,& this->GetFont());
wxGetCharSize(GetHWND(), &cx, &cy, this->GetFont());
if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL)
{

4
src/msw/spinctrl.cpp
View File

@@ -378,7 +378,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
if ( sizeText.y <= 0 )
{
int cx, cy;
wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
sizeText.y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
}
@@ -526,7 +526,7 @@ wxSize wxSpinCtrl::DoGetBestSize() const
sizeBtn.x += DEFAULT_ITEM_WIDTH + MARGIN_BETWEEN;
int y;
wxGetCharSize(GetHWND(), NULL, &y, &GetFont());
wxGetCharSize(GetHWND(), NULL, &y, GetFont());
y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(y);
// JACS: we should always use the height calculated

2
src/msw/statbox.cpp
View File

@@ -143,7 +143,7 @@ bool wxStaticBox::Create(wxWindow *parent,
wxSize wxStaticBox::DoGetBestSize() const
{
int cx, cy;
wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
int wBox;
GetTextExtent(wxGetWindowText(m_hWnd), &wBox, &cy);

2
src/msw/textctrl.cpp
View File

@@ -1932,7 +1932,7 @@ bool wxTextCtrl::AcceptsFocus() const
wxSize wxTextCtrl::DoGetBestSize() const
{
int cx, cy;
wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
int wText = DEFAULT_ITEM_WIDTH;

2
src/msw/tglbtn.cpp
View File

@@ -117,7 +117,7 @@ wxSize wxToggleButton::DoGetBestSize() const
GetTextExtent(label, &wBtn, NULL);
int wChar, hChar;
wxGetCharSize(GetHWND(), &wChar, &hChar, &GetFont());
wxGetCharSize(GetHWND(), &wChar, &hChar, GetFont());
// add a margin - the button is wider than just its label
wBtn += 3*wChar;

22
src/msw/window.cpp
View File

@@ -4887,22 +4887,21 @@ bool wxWindowMSW::MSWOnScroll(int orientation, WXWORD wParam,
// global functions
// ===========================================================================
void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont *the_font)
void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont& the_font)
{
TEXTMETRIC tm;
HDC dc = ::GetDC((HWND) wnd);
HFONT fnt =0;
HFONT was = 0;
if ( the_font )
{
// the_font->UseResource();
// the_font->RealizeResource();
fnt = (HFONT)((wxFont *)the_font)->GetResourceHandle(); // const_cast
if ( fnt )
was = (HFONT) SelectObject(dc,fnt);
}
// the_font.UseResource();
// the_font.RealizeResource();
fnt = (HFONT)the_font.GetResourceHandle(); // const_cast
if ( fnt )
was = (HFONT) SelectObject(dc,fnt);
GetTextMetrics(dc, &tm);
if ( the_font && fnt && was )
if ( fnt && was )
{
SelectObject(dc,was);
}
@@ -4913,8 +4912,7 @@ void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont *the_font)
if ( y )
*y = tm.tmHeight + tm.tmExternalLeading;
// if ( the_font )
// the_font->ReleaseResource();
// the_font.ReleaseResource();
}
// Returns 0 if was a normal ASCII value, not a special key. This indicates that