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

no message

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-02-18 23:35:39 +00:00
parent 3dbeaa523d
commit 0fe536e3f6
3 changed files with 82 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
src/os2/frame.cpp
View File

@@ -438,51 +438,74 @@ bool wxFrame::IsMaximized() const
return (vSwp.fl & SWP_MAXIMIZE);
} // end of wxFrame::IsMaximized
void wxFrame::SetIcon(const wxIcon& icon)
void wxFrame::SetIcon(
const wxIcon& rIcon
)
{
wxFrameBase::SetIcon(icon);
wxFrameBase::SetIcon(rIcon);
// TODO:
/*
if ( m_icon.Ok() )
if (m_icon.Ok())
{
SendMessage(GetHwnd(), WM_SETICON,
(WPARAM)TRUE, (LPARAM)(HICON) m_icon.GetHICON());
WinSendMessage( GetHwnd()
,WM_SETICON
,(HICON) m_icon.GetHICON()
,NULL
)
}
*/
}
} // end of wxFrame::SetIcon
#if wxUSE_STATUSBAR
wxStatusBar *wxFrame::OnCreateStatusBar(int number,
long style,
wxWindowID id,
const wxString& name)
wxStatusBar* wxFrame::OnCreateStatusBar(
int nNumber
, long lStyle
, wxWindowID vId
, const wxString& rName
)
{
wxStatusBar *statusBar = NULL;
wxStatusBar* pStatusBar = NULL;
statusBar = wxFrameBase::OnCreateStatusBar(number, style, id, name);
return statusBar;
}
pStatusBar = wxFrameBase::OnCreateStatusBar( nNumber
,lStyle
,vId
,rName
);
return pStatusBar;
} // end of wxFrame::OnCreateStatusBar
void wxFrame::PositionStatusBar()
{
// TODO:
/*
// native status bar positions itself
if ( m_frameStatusBar )
//
// Native status bar positions itself
//
if (m_frameStatusBar)
{
int w, h;
GetClientSize(&w, &h);
int sw, sh;
m_frameStatusBar->GetSize(&sw, &sh);
int nWidth
int nHeight;
int nStatbarWidth
int nStatbarHeight;
HWND hWndClient;
RECTL vRect;
hWndClient = ::WinWindowFromId(GetHwnd(), FID_CLIENT);
::WinQueryWindowRect(hWndClient, &vRect);
nWidth = vRect.xRight - vRect.xLeft;
nHeight = vRect.xTop - vRect.xBottom;
m_frameStatusBar->GetSize( &nStatbarWidth
,&nStatbarHeight
);
//
// Since we wish the status bar to be directly under the client area,
// we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS.
m_frameStatusBar->SetSize(0, h, w, sh);
//
m_frameStatusBar->SetSize( 0
,nHeight
,nWidth
,nStatbarHeight
);
}
*/
}
} // end of wxFrame::PositionStatusBar
#endif // wxUSE_STATUSBAR
void wxFrame::DetachMenuBar()
@@ -492,42 +515,51 @@ void wxFrame::DetachMenuBar()
m_frameMenuBar->Detach();
m_frameMenuBar = NULL;
}
}
} // end of wxFrame::DetachMenuBar
void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
void wxFrame::SetMenuBar(
wxMenuBar* pMenuBbar
)
{
if (!menu_bar)
if (!pMenuBar)
{
DetachMenuBar();
return;
}
wxCHECK_RET( !menu_bar->GetFrame(), wxT("this menubar is already attached") );
wxCHECK_RET(!pMenuBar->GetFrame(), wxT("this menubar is already attached"));
if (m_frameMenuBar)
delete m_frameMenuBar;
m_hMenu = menu_bar->Create();
m_hMenu = pMenuBbar->Create();
m_ulMenubarId = pMenubar->GetMenubarId();
if (m_ulMenubarId != FID_MENU)
{
::WinSetWIndowUShort( m_hMenu
,QWS_ID
,(unsigned short(m_ulMenubarId)
);
}
if ( !m_hMenu )
if (!m_hMenu)
return;
InternalSetMenuBar();
m_frameMenuBar = menu_bar;
menu_bar->Attach(this);
}
} // end of wxFrame::SetMenuBar
void wxFrame::InternalSetMenuBar()
{
// TODO:
/*
if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) )
{
wxLogLastError("SetMenu");
}
*/
}
::WinPostMsg( GetHwnd()
,WM_UPDATEFRAME
,FCF_MENU
,NULL
);
} // end of wxFrame::InternalSetMenuBar
// Responds to colour changes, and passes event on to children.
void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)