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

fix width/height typo in DoSetClientSize, remove unused stuff

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett 2006-10-09 05:12:00 +00:00
parent 607afa3cd4
commit d0dec99212
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mac/carbon/window.cpp
View File

@ -89,8 +89,6 @@ END_EVENT_TABLE()
#define wxMAC_DEBUG_REDRAW 0 #define wxMAC_DEBUG_REDRAW 0
#endif #endif
#define wxMAC_USE_THEME_BORDER 1
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// Utility Routines to move between different coordinate systems // Utility Routines to move between different coordinate systems
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@ -142,9 +140,6 @@ void wxMacWindowToNative( const wxWindow* window , Rect *rect )
// Carbon Events // Carbon Events
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
extern long wxMacTranslateKey(unsigned char key, unsigned char code) ;
pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessage , SInt16 iDepth , Boolean iIsColor ) ;
#if TARGET_API_MAC_OSX #if TARGET_API_MAC_OSX
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3 #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3
@ -2030,7 +2025,7 @@ wxPoint wxWindowMac::GetClientAreaOrigin() const
void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight) void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
{ {
if ( clientheight != wxDefaultCoord || clientheight != wxDefaultCoord ) if ( clientwidth != wxDefaultCoord || clientheight != wxDefaultCoord )
{ {
int currentclientwidth , currentclientheight ; int currentclientwidth , currentclientheight ;
int currentwidth , currentheight ; int currentwidth , currentheight ;
@ -3118,8 +3113,6 @@ WXWindow wxWindowMac::MacGetTopLevelWindowRef() const
iter = iter->GetParent() ; iter = iter->GetParent() ;
} }
wxASSERT_MSG( 1 , wxT("No valid mac root window") ) ;
return NULL ; return NULL ;
} }
@ -3131,11 +3124,9 @@ void wxWindowMac::MacCreateScrollBars( long style )
{ {
bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ; bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ;
int scrlsize = MAC_SCROLLBAR_SIZE ; int scrlsize = MAC_SCROLLBAR_SIZE ;
wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL ;
if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL || GetWindowVariant() == wxWINDOW_VARIANT_MINI ) if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL || GetWindowVariant() == wxWINDOW_VARIANT_MINI )
{ {
scrlsize = MAC_SMALL_SCROLLBAR_SIZE ; scrlsize = MAC_SMALL_SCROLLBAR_SIZE ;
variant = wxWINDOW_VARIANT_SMALL ;
} }
int adjust = hasBoth ? scrlsize - 1: 0 ; int adjust = hasBoth ? scrlsize - 1: 0 ;