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

Simplify wxWinCE #ifdefs.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-04-28 10:19:41 +00:00
parent 268c20fa31
commit 6f26f98eb5
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/msw/toplevel.cpp
View File

@@ -177,9 +177,8 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
// WS_POPUP in a few cases just to avoid having caption/border which we // WS_POPUP in a few cases just to avoid having caption/border which we
// don't want // don't want
#if !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
// border and caption styles // border and caption styles
if ( style & wxRESIZE_BORDER ) if ( ( style & wxRESIZE_BORDER ) && !IsAlwaysMaximized())
msflags |= WS_THICKFRAME; msflags |= WS_THICKFRAME;
else if ( exflags && ((style & wxBORDER_DOUBLE) || (style & wxBORDER_RAISED)) ) else if ( exflags && ((style & wxBORDER_DOUBLE) || (style & wxBORDER_RAISED)) )
*exflags |= WS_EX_DLGMODALFRAME; *exflags |= WS_EX_DLGMODALFRAME;
@@ -188,7 +187,6 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
#ifndef __POCKETPC__ #ifndef __POCKETPC__
else else
msflags |= WS_POPUP; msflags |= WS_POPUP;
#endif
#endif #endif
// normally we consider that all windows without a caption must be popups, // normally we consider that all windows without a caption must be popups,
@@ -223,10 +221,8 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
if ( style & wxMINIMIZE ) if ( style & wxMINIMIZE )
msflags |= WS_MINIMIZE; msflags |= WS_MINIMIZE;
#if !defined(__POCKETPC__)
if ( style & wxMAXIMIZE ) if ( style & wxMAXIMIZE )
msflags |= WS_MAXIMIZE; msflags |= WS_MAXIMIZE;
#endif
// Keep this here because it saves recoding this function in wxTinyFrame // Keep this here because it saves recoding this function in wxTinyFrame
if ( style & (wxTINY_CAPTION_VERT | wxTINY_CAPTION_HORIZ) ) if ( style & (wxTINY_CAPTION_VERT | wxTINY_CAPTION_HORIZ) )
@@ -495,15 +491,16 @@ bool wxTopLevelWindowMSW::CreateFrame(const wxString& title,
WXDWORD exflags; WXDWORD exflags;
WXDWORD flags = MSWGetCreateWindowFlags(&exflags); WXDWORD flags = MSWGetCreateWindowFlags(&exflags);
#if !defined(__HANDHELDPC__) && ((defined(_WIN32_WCE) && _WIN32_WCE < 400) || \ wxSize sz;
defined(__POCKETPC__) || \
defined(__SMARTPHONE__)) if (IsAlwaysMaximized())
// Always expand to fit the screen in PocketPC or SmartPhone {
wxSize sz(wxDefaultSize); sz = wxDefaultSize;
wxUnusedVar(size); }
#else // other (including normal desktop) Windows else
wxSize sz(size); {
#endif sz = size;
}
bool result = MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags); bool result = MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags);
@@ -596,14 +593,10 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
MSWUpdateUIState(UIS_INITIALIZE); MSWUpdateUIState(UIS_INITIALIZE);
} }
// Note: if we include PocketPC in this test, dialogs can fail to show up, if ( ( style & wxMAXIMIZE ) || IsAlwaysMaximized() )
// for example the text entry dialog in the dialogs sample. Problem with Maximise()?
#if defined(__WXWINCE__) && (defined(__SMARTPHONE__) || defined(__WINCE_STANDARDSDK__))
if ( style & wxMAXIMIZE )
{ {
this->Maximize(); this->Maximize();
} }
#endif
#if defined(__SMARTPHONE__) && defined(__WXWINCE__) #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
SetRightMenu(); // to nothing for initialization SetRightMenu(); // to nothing for initialization