X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c4a764c984ba8e482e5d808fd1c762aeb5b535a..9a29912f608e082001ee53b9873323c4bcd71f21:/include/wx/msw/private.h?ds=sidebyside diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index 3f7506841b..54d0d96e88 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -6,7 +6,7 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_PRIVATE_H_ @@ -20,10 +20,10 @@ class WXDLLEXPORT wxFont ; -void WXDLLEXPORT wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font); -void WXDLLEXPORT wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos); -wxWindow* WXDLLEXPORT wxFindWinFromHandle(WXHWND hWnd); -void WXDLLEXPORT wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos); +WXDLLEXPORT void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font); +WXDLLEXPORT void wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos); +WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd); +WXDLLEXPORT void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos); WXDLLEXPORT_DATA(extern HICON) wxSTD_FRAME_ICON; WXDLLEXPORT_DATA(extern HICON) wxSTD_MDIPARENTFRAME_ICON; @@ -33,47 +33,62 @@ WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDIPARENTFRAME_ICON; WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDICHILDFRAME_ICON; WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT; -extern HINSTANCE WXDLLEXPORT wxGetInstance(); -void WXDLLEXPORT wxFillLogFont(LOGFONT *logFont, wxFont *font); -wxFont WXDLLEXPORT wxCreateFontFromLogFont(LOGFONT *logFont); // , bool createNew = TRUE); +WXDLLEXPORT HINSTANCE wxGetInstance(); +WXDLLEXPORT void wxFillLogFont(LOGFONT *logFont, wxFont *font); +WXDLLEXPORT wxFont wxCreateFontFromLogFont(LOGFONT *logFont); // , bool createNew = TRUE); #ifdef __GNUWIN32__ # define CASTWNDPROC (long unsigned) #else # ifdef __BORLANDC__ + +# ifdef __WIN32__ # define CASTWNDPROC +# else + typedef int (pascal * WndProcCast) (); +# define CASTWNDPROC (WndProcCast) +# endif + # else # if defined (__WIN32__) && defined(STRICT) typedef long (_stdcall * WndProcCast) (HWND, unsigned int, unsigned int, long); # define CASTWNDPROC (WndProcCast) +# elif defined(__WIN16__) +# ifdef __BORLANDC__ + typedef int (pascal * WndProcCast) (); +# define CASTWNDPROC (WndProcCast) +# else + typedef int (PASCAL * WndProcCast) (); +# define CASTWNDPROC (WndProcCast) +# endif # else # define CASTWNDPROC # endif # endif #endif -#if !defined(APIENTRY) // NT defines APIENTRY, 3.x not +#if !defined(APIENTRY) // NT defines APIENTRY, 3.x not #define APIENTRY FAR PASCAL #endif - + #ifdef __WIN32__ #define _EXPORT /**/ #else #define _EXPORT _export typedef signed short int SHORT ; #endif - -#if !defined(__WIN32__) // 3.x uses FARPROC for dialogs + +#if !defined(__WIN32__) // 3.x uses FARPROC for dialogs #define DLGPROC FARPROC #endif -#if USE_PENWIN -void WXDLLEXPORT wxRegisterPenWin(void); -void WXDLLEXPORT wxCleanUpPenWin(void); -void WXDLLEXPORT wxEnablePenAppHooks (bool hook); +#if wxUSE_PENWIN +WXDLLEXPORT void wxRegisterPenWin(void); +WXDLLEXPORT void wxCleanUpPenWin(void); +WXDLLEXPORT void wxEnablePenAppHooks (bool hook); #endif -#if USE_ITSY_BITSY +#if wxUSE_ITSY_BITSY #define IBS_HORZCAPTION 0x4000L #define IBS_VERTCAPTION 0x8000L @@ -104,7 +119,7 @@ VOID WINAPI ibAdjustWindowRect( HWND hWnd, LPRECT lprc ) ; * Decide what window classes we're going to use * for this combination of CTl3D/FAFA settings */ - + #define STATIC_CLASS "STATIC" #define STATIC_FLAGS (SS_LEFT|WS_CHILD|WS_VISIBLE) #define CHECK_CLASS "BUTTON" @@ -136,7 +151,7 @@ extern LONG APIENTRY _EXPORT wxSubclassedGenericControlProc(WXHWND hWnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam); // Find maximum size of window/rectangle -extern void WXDLLEXPORT wxFindMaxSize(WXHWND hwnd, RECT *rect); +WXDLLEXPORT extern void wxFindMaxSize(WXHWND hwnd, RECT *rect); // List of scrollbar controls WXDLLEXPORT_DATA(extern wxList) wxScrollBarList; @@ -145,14 +160,30 @@ WXDLLEXPORT_DATA(extern FARPROC) wxGenericControlSubClassProc; WXDLLEXPORT_DATA(extern char*) wxBuffer; WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance; -wxWindow* WXDLLEXPORT wxFindControlFromHandle(WXHWND hWnd); -void WXDLLEXPORT wxAddControlHandle(WXHWND hWnd, wxWindow *item); +WXDLLEXPORT wxWindow* wxFindControlFromHandle(WXHWND hWnd); +WXDLLEXPORT void wxAddControlHandle(WXHWND hWnd, wxWindow *item); // Safely get the window text (i.e. without using fixed size buffer) -extern wxString WXDLLEXPORT wxGetWindowText(WXHWND hWnd); +WXDLLEXPORT extern wxString wxGetWindowText(WXHWND hWnd); + +// Does this window style specify any border? +inline bool wxStyleHasBorder(long style) +{ + return (style & (wxSIMPLE_BORDER | wxRAISED_BORDER | + wxSUNKEN_BORDER | wxDOUBLE_BORDER)) != 0; +} #if !defined(__WIN32__) && !defined(WS_EX_CLIENTEDGE) -#define WS_EX_CLIENTEDGE 0 + #define WS_EX_CLIENTEDGE 0 +#endif + +#if defined(__WIN95__) && defined(__WXDEBUG__) && wxUSE_DBWIN32 +#ifdef OutputDebugString +#undef OutputDebugString +#endif + +#define OutputDebugString OutputDebugStringW95 +extern void OutputDebugStringW95(const char*, ...); #endif #endif