X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbcdf8bc7ca806d8278c7cb6d09d5590378b67d8..47bc1060127d86222768789575295254a710f5a6:/include/wx/msw/private.h diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index c764c5641f..8633deb50b 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_ @@ -52,28 +52,28 @@ wxFont WXDLLEXPORT wxCreateFontFromLogFont(LOGFONT *logFont); // , bool createNe # 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 +#if wxUSE_PENWIN void WXDLLEXPORT wxRegisterPenWin(void); void WXDLLEXPORT wxCleanUpPenWin(void); void WXDLLEXPORT wxEnablePenAppHooks (bool hook); #endif -#if USE_ITSY_BITSY +#if wxUSE_ITSY_BITSY #define IBS_HORZCAPTION 0x4000L #define IBS_VERTCAPTION 0x8000L @@ -104,7 +104,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" @@ -126,8 +126,9 @@ VOID WINAPI ibAdjustWindowRect( HWND hWnd, LPRECT lprc ) ; #define MEANING_CHARACTER '0' #define DEFAULT_ITEM_WIDTH 200 #define DEFAULT_ITEM_HEIGHT 80 -#define EDIT_CONTROL_FACTOR (15.0/10.0) - // Scale font to get edit control height + +// Scale font to get edit control height +#define EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy) (3*(cy)/2) // Generic subclass proc, for panel item moving/sizing and intercept // EDIT control VK_RETURN messages @@ -147,8 +148,18 @@ WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance; wxWindow* WXDLLEXPORT wxFindControlFromHandle(WXHWND hWnd); void WXDLLEXPORT wxAddControlHandle(WXHWND hWnd, wxWindow *item); +// Safely get the window text (i.e. without using fixed size buffer) +extern wxString WXDLLEXPORT wxGetWindowText(WXHWND hWnd); + +// Does this window style specify any border? +inline bool WXDLLEXPORT 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 #endif