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

Source cleaning: -1/wxID_ANY/wxDefaultCoord, ::, !!/!IsEmpty(), TRUE/true. FALSE/false, tabs, whitespaces.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-09-07 11:11:05 +00:00
parent db5cf2b04a
commit 27d2dbbcca
11 changed files with 122 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/wx/msw/uxtheme.h
View File

@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////
// Name: include/wx/msw/uxtheme.h
// Purpose: wxUxThemeEngine class: support for XP themes
// Author:
// Author:
// Modified by:
// Created: 2003
// RCS-ID: $Id$
@@ -58,17 +58,17 @@ typedef struct _WXUOSVERSIONINFOEXA {
typedef void* WXHTHEME;
typedef long WXUHRESULT;
typedef WXHTHEME (__stdcall *PFNWXUOPENTHEMEDATA)(WXHWND, const wchar_t *);
typedef WXHTHEME (__stdcall *PFNWXUOPENTHEMEDATA)(WXHWND, const wchar_t *);
typedef WXUHRESULT (__stdcall *PFNWXUCLOSETHEMEDATA)(WXHTHEME);
typedef WXUHRESULT (__stdcall *PFNWXUDRAWTHEMEBACKGROUND)(WXHTHEME, WXHDC,
typedef WXUHRESULT (__stdcall *PFNWXUDRAWTHEMEBACKGROUND)(WXHTHEME, WXHDC,
int, int, const RECT *, const RECT *);
#define WXU_DTT_GRAYED 0x1
typedef WXUHRESULT (__stdcall *PFNWXUDRAWTHEMETEXT)(WXHTHEME, WXHDC, int,
int, const wchar_t *, int, DWORD,
typedef WXUHRESULT (__stdcall *PFNWXUDRAWTHEMETEXT)(WXHTHEME, WXHDC, int,
int, const wchar_t *, int, DWORD,
DWORD, const RECT *);
typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEBACKGROUNDCONTENTRECT)(WXHTHEME, WXHDC,
typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEBACKGROUNDCONTENTRECT)(WXHTHEME, WXHDC,
int, int, const RECT *, RECT *);
typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEBACKGROUNDEXTENT)(WXHTHEME, WXHDC, int, int,
typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEBACKGROUNDEXTENT)(WXHTHEME, WXHDC, int, int,
const RECT *, RECT *);
enum WXUTHEMESIZE
@@ -108,9 +108,9 @@ typedef struct tagWXUTEXTMETRIC
unsigned char tmCharSet;
} WXUTEXTMETRIC;
typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEPARTSIZE)(WXHTHEME, WXHDC, int, int, const RECT *,
typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEPARTSIZE)(WXHTHEME, WXHDC, int, int, const RECT *,
enum WXUTHEMESIZE, WXUSIZE *);
typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMETEXTEXTENT)(WXHTHEME, WXHDC, int, int, const wchar_t *,
typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMETEXTEXTENT)(WXHTHEME, WXHDC, int, int, const wchar_t *,
int, WXDWORD, const RECT *, RECT *);
typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMETEXTMETRICS)(WXHTHEME, WXHDC,
int, int, WXUTEXTMETRIC*);
@@ -188,7 +188,7 @@ typedef struct _WXUINTLIST
int iValues[WXU_MAX_INTLIST_COUNT];
} WXUINTLIST, *PWXUINTLIST;
typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEINTLIST)(WXHTHEME, int,
int, int, WXUINTLIST*);
int, int, WXUINTLIST*);
enum WXUPROPERTYORIGIN
{
@@ -228,7 +228,7 @@ typedef BOOL (__stdcall *PFNWXUISTHEMEDIALOGTEXTUREENABLED)(WXHWND);
typedef WXDWORD (__stdcall *PFNWXUGETTHEMEAPPPROPERTIES)();
typedef void (__stdcall *PFNWXUSETTHEMEAPPPROPERTIES)(WXDWORD);
typedef WXUHRESULT (__stdcall *PFNWXUGETCURRENTTHEMENAME)(wchar_t *, int,
typedef WXUHRESULT (__stdcall *PFNWXUGETCURRENTTHEMENAME)(wchar_t *, int,
wchar_t *, int, wchar_t *, int);
#define WXU_SZ_THDOCPROP_DISPLAYNAME L"DisplayName"
@@ -329,7 +329,7 @@ private:
// uxtheme.dll
wxDynamicLibrary m_dllUxTheme;
// the one and only theme engine, initially NULL
static wxUxThemeEngine *ms_themeEngine;
@@ -363,7 +363,7 @@ public:
{
wxUxThemeEngine *engine = wxUxThemeEngine::Get();
m_hTheme =
m_hTheme =
engine ? (WXHTHEME)engine->OpenThemeData(win->GetHWND(), classes)
: NULL;
}

34
include/wx/msw/window.h
View File

@@ -75,8 +75,8 @@ public:
virtual void Raise();
virtual void Lower();
virtual bool Show( bool show = TRUE );
virtual bool Enable( bool enable = TRUE );
virtual bool Show( bool show = true );
virtual bool Enable( bool enable = true );
virtual void SetFocus();
virtual void SetFocusFromKbd();
@@ -85,7 +85,7 @@ public:
virtual void WarpPointer(int x, int y);
virtual void Refresh( bool eraseBackground = TRUE,
virtual void Refresh( bool eraseBackground = true,
const wxRect *rect = (const wxRect *) NULL );
virtual void Update();
virtual void Freeze();
@@ -109,8 +109,8 @@ public:
#endif // wxUSE_MENUS_NATIVE
virtual void SetScrollbar( int orient, int pos, int thumbVisible,
int range, bool refresh = TRUE );
virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
int range, bool refresh = true );
virtual void SetScrollPos( int orient, int pos, bool refresh = true );
virtual int GetScrollPos( int orient ) const;
virtual int GetScrollThumb( int orient ) const;
virtual int GetScrollRange( int orient ) const;
@@ -130,7 +130,7 @@ public:
#if WXWIN_COMPATIBILITY_2_4
wxDEPRECATED( bool GetUseCtl3D() const );
wxDEPRECATED( bool GetTransparentBackground() const );
wxDEPRECATED( void SetTransparent(bool t = TRUE) );
wxDEPRECATED( void SetTransparent(bool t = true) );
#endif // WXWIN_COMPATIBILITY_2_4
#ifndef __WXUNIVERSAL__
@@ -179,16 +179,16 @@ public:
WXFARPROC MSWGetOldWndProc() const { return m_oldWndProc; }
void MSWSetOldWndProc(WXFARPROC proc) { m_oldWndProc = proc; }
// return TRUE if the window is of a standard (i.e. not wxWidgets') class
// return true if the window is of a standard (i.e. not wxWidgets') class
//
// to understand why does it work, look at SubclassWin() code and comments
bool IsOfStandardClass() const { return m_oldWndProc != NULL; }
wxWindow *FindItem(long id) const;
wxWindow *FindItemByHWND(WXHWND hWnd, bool controlOnly = FALSE) const;
wxWindow *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
// MSW only: TRUE if this control is part of the main control
virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return FALSE; };
// MSW only: true if this control is part of the main control
virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; };
// translate wxWidgets style flags for this control into the Windows style
// and optional extended style for the corresponding native control
@@ -207,7 +207,7 @@ public:
// translate wxWidgets coords into Windows ones suitable to be passed to
// ::CreateWindow()
//
// returns TRUE if non default coords are returned, FALSE otherwise
// returns true if non default coords are returned, false otherwise
bool MSWGetCreateWindowCoords(const wxPoint& pos,
const wxSize& size,
int& x, int& y,
@@ -219,7 +219,7 @@ public:
// creates the window of specified Windows class with given style, extended
// style, title and geometry (default values
//
// returns TRUE if the window has been created, FALSE if creation failed
// returns true if the window has been created, false if creation failed
bool MSWCreate(const wxChar *wclass,
const wxChar *title = NULL,
const wxPoint& pos = wxDefaultPosition,
@@ -259,7 +259,7 @@ public:
// ------------------------------------------------------------------------
// internal handlers for MSW messages: all handlers return a boolean value:
// TRUE means that the handler processed the event and FALSE that it didn't
// true means that the handler processed the event and false that it didn't
// ------------------------------------------------------------------------
// there are several cases where we have virtual functions for Windows
@@ -327,7 +327,7 @@ public:
bool HandleMouseMove(int x, int y, WXUINT flags);
bool HandleMouseWheel(WXWPARAM wParam, WXLPARAM lParam);
bool HandleChar(WXWPARAM wParam, WXLPARAM lParam, bool isASCII = FALSE);
bool HandleChar(WXWPARAM wParam, WXLPARAM lParam, bool isASCII = false);
bool HandleKeyDown(WXWPARAM wParam, WXLPARAM lParam);
bool HandleKeyUp(WXWPARAM wParam, WXLPARAM lParam);
#if wxUSE_ACCEL
@@ -349,14 +349,14 @@ public:
// message processing helpers
// return FALSE if the message shouldn't be translated/preprocessed but
// return false if the message shouldn't be translated/preprocessed but
// dispatched normally
virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg);
// return TRUE if the message was preprocessed and shouldn't be dispatched
// return true if the message was preprocessed and shouldn't be dispatched
virtual bool MSWProcessMessage(WXMSG* pMsg);
// return TRUE if the message was translated and shouldn't be dispatched
// return true if the message was translated and shouldn't be dispatched
virtual bool MSWTranslateMessage(WXMSG* pMsg);
// called when the window is about to be destroyed

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

@@ -395,7 +395,7 @@
#if defined(__WXWINCE__) && defined(DrawIcon) //#ifdef DrawIcon
#undef DrawIcon
inline BOOL DrawIcon(HDC hdc, int x, int y, HICON hicon)
inline BOOL DrawIcon(HDC hdc, int x, int y, HICON hicon)
{
return DrawIconEx(hdc,x,y,hicon,0,0,0,NULL, DI_NORMAL) ;
}