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

some clean up of the code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-09-07 09:01:35 +00:00
parent 88db66e373
commit 8ed57d9312
3 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/msw/bitmap.cpp
View File

@@ -84,8 +84,6 @@ wxList wxBitmap::sm_handlers;
wxBitmap::wxBitmap(void) wxBitmap::wxBitmap(void)
{ {
m_refData = NULL; // new wxBitmapRefData;
if ( wxTheBitmapList ) if ( wxTheBitmapList )
wxTheBitmapList->AddBitmap(this); wxTheBitmapList->AddBitmap(this);
} }

2
src/msw/button.cpp
View File

@@ -151,6 +151,8 @@ void wxButton::SetDefault(void)
{ {
SendMessage((HWND)parent->GetHWND(), DM_SETDEFID, m_windowId, 0L); SendMessage((HWND)parent->GetHWND(), DM_SETDEFID, m_windowId, 0L);
} }
SendMessage((HWND)GetHWND(), BM_SETSTYLE, BS_DEFPUSHBUTTON, 1L);
} }
wxString wxButton::GetLabel(void) const wxString wxButton::GetLabel(void) const

10
src/msw/icon.cpp
View File

@@ -123,12 +123,12 @@ bool wxICOFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long fla
if ( bitmap->IsKindOf(CLASSINFO(wxIcon)) ) if ( bitmap->IsKindOf(CLASSINFO(wxIcon)) )
{ {
wxIcon *icon = (wxIcon *)bitmap; wxIcon *icon = (wxIcon *)bitmap;
int width, height; wxIconRefData *data = (wxIconRefData *)icon->GetRefData();
WXHICON hIcon = (WXHICON) ReadIconFile((char *)(const char *)name, wxGetInstance(), &width, &height); data->m_hIcon = (WXHICON)ReadIconFile((char *)name.c_str(), wxGetInstance(),
&data->m_width, &data->m_height);
((wxIconRefData *)icon->GetRefData())->m_hIcon = hIcon; data->m_ok = data->m_hIcon != 0;
((wxIconRefData *)icon->GetRefData())->m_ok = (((wxIconRefData *)icon->GetRefData())->m_hIcon != 0); return data->m_ok;
return ((wxIconRefData *)icon->GetRefData())->m_ok;
} }
else else
return FALSE; return FALSE;