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

fixed unused variable warning

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-04-21 11:35:04 +00:00
parent 7368be43c3
commit a48e51ce11
1 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/msw/toplevel.cpp
View File

@@ -414,10 +414,11 @@ bool wxTopLevelWindowMSW::CreateFrame(const wxString& title,
WXDWORD exflags; WXDWORD exflags;
WXDWORD flags = MSWGetCreateWindowFlags(&exflags); WXDWORD flags = MSWGetCreateWindowFlags(&exflags);
wxSize sz(size);
#if _WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP) #if _WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP)
// Always expand to fit the screen in PocketPC or SmartPhone // Always expand to fit the screen in PocketPC or SmartPhone
sz = wxDefaultSize; wxSize sz(wxDefaultSize);
#else // other (including normal desktop) Windows
wxSize sz(size);
#endif #endif
return MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags); return MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags);
@@ -934,29 +935,36 @@ wxDlgProc(HWND hDlg,
WPARAM WXUNUSED(wParam), WPARAM WXUNUSED(wParam),
LPARAM WXUNUSED(lParam)) LPARAM WXUNUSED(lParam))
{ {
switch ( message ) if ( message == WM_INITDIALOG )
{ {
case WM_INITDIALOG: // under CE, add a "Ok" button in the dialog title bar and make it full
// for this message, returning TRUE tells system to set focus to // screen
// the first control in the dialog box, but as we set the focus //
// ourselves, we return FALSE from here as well, so fall through // VZ: we should probably allow for overriding this, e.g. by including
// Standard SDK doesn't have aygshell.dll: see include/wx/msw/wince/libraries.h // MAXIMIZED flag in the dialog style by default and doing this
#if defined(__WXWINCE__) && !defined(WCE_PLATFORM_STANDARDSDK) // only if it is present...
{
SHINITDLGINFO shidi;
shidi.dwMask = SHIDIM_FLAGS;
shidi.dwFlags = SHIDIF_DONEBUTTON |
SHIDIF_SIZEDLGFULLSCREEN;
shidi.hDlg = hDlg;
SHInitDialog( &shidi );
}
#endif
default: // Standard SDK doesn't have aygshell.dll: see
// for all the other ones, FALSE means that we didn't process the // include/wx/msw/wince/libraries.h
// message #if defined(__WXWINCE__) && !defined(WCE_PLATFORM_STANDARDSDK)
return FALSE; SHINITDLGINFO shidi;
shidi.dwMask = SHIDIM_FLAGS;
shidi.dwFlags = SHIDIF_DONEBUTTON |
SHIDIF_SIZEDLGFULLSCREEN;
shidi.hDlg = hDlg;
SHInitDialog( &shidi );
#else // no SHInitDialog()
wxUnusedVar(hDlg);
#endif
} }
// for almost all messages, returning FALSE means that we didn't process
// the message
//
// for WM_INITDIALOG, returning TRUE tells system to set focus to
// the first control in the dialog box, but as we set the focus
// ourselves, we return FALSE for it as well
return FALSE;
} }
// ============================================================================ // ============================================================================