Add wxFontDialog ctor not taking wxFontData to wxOSX.

[wxWidgets.git] / src / osx / carbon / window.cpp

diff --git a/src/osx/carbon/window.cpp b/src/osx/carbon/window.cpp
index a4b78de67591ab8192176decd5d0e9450f7607dd..aa7fc3fd3400aa2879555cfd34eea65e7f53921a 100644 (file)
--- a/src/osx/carbon/window.cpp
+++ b/src/osx/carbon/window.cpp
@@ -585,7 +585,7 @@ wxMacWindowServiceEventHandler(EventHandlerCallRef WXUNUSED(handler),
     return result ;
 }
 
     return result ;
 }
 

-pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+WXDLLEXPORT pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , EventRef event , void *data )

 {
     OSStatus result = eventNotHandledErr ;
     wxWindowMac* focus = (wxWindowMac*) data ;
 {
     OSStatus result = eventNotHandledErr ;
     wxWindowMac* focus = (wxWindowMac*) data ;


@@ -610,14 +610,9 @@ pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , Even
         uniChars = new wchar_t[ numChars ] ;
         GetEventParameter( event, kEventParamTextInputSendText, typeUnicodeText, NULL, dataSize , NULL , charBuf ) ;
         charBuf[ numChars - 1 ] = 0;
         uniChars = new wchar_t[ numChars ] ;
         GetEventParameter( event, kEventParamTextInputSendText, typeUnicodeText, NULL, dataSize , NULL , charBuf ) ;
         charBuf[ numChars - 1 ] = 0;

-#if SIZEOF_WCHAR_T == 2
-        uniChars = (wchar_t*) charBuf ;
-/*        memcpy( uniChars , charBuf , numChars * 2 ) ;*/   // is there any point in copying charBuf over itself? (in fact, memcpy isn't even guaranteed to work correctly if the source and destination ranges overlap...)
-#else

         // the resulting string will never have more chars than the utf16 version, so this is safe
         wxMBConvUTF16 converter ;
         numChars = converter.MB2WC( uniChars , (const char*)charBuf , numChars ) ;
         // the resulting string will never have more chars than the utf16 version, so this is safe
         wxMBConvUTF16 converter ;
         numChars = converter.MB2WC( uniChars , (const char*)charBuf , numChars ) ;

-#endif

     }
 
     switch ( GetEventKind( event ) )
     }
 
     switch ( GetEventKind( event ) )


@@ -841,7 +836,7 @@ wxWidgetImplType* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer,
 {
     OSStatus err = noErr;
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
 {
     OSStatus err = noErr;
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;

-    wxMacControl* c = new wxMacControl(wxpeer) ;
+    wxMacControl* c = new wxMacControl(wxpeer, false, true) ;

     UInt32 features = 0
         | kControlSupportsEmbedding
         | kControlSupportsLiveFeedback
     UInt32 features = 0
         | kControlSupportsEmbedding
         | kControlSupportsLiveFeedback


@@ -873,8 +868,8 @@ wxMacControl::wxMacControl()
     Init();
 }
 
     Init();
 }
 

-wxMacControl::wxMacControl(wxWindowMac* peer , bool isRootControl ) :
-    wxWidgetImpl( peer, isRootControl )
+wxMacControl::wxMacControl(wxWindowMac* peer , bool isRootControl, bool isUserPane ) :
+    wxWidgetImpl( peer, isRootControl, isUserPane )

 {
     Init();
 }
 {
     Init();
 }


@@ -1001,7 +996,7 @@ void wxMacControl::GetPosition( int &x, int &y ) const
         x -= (int)parent.origin.x;
         y -= (int)parent.origin.y;
     }
         x -= (int)parent.origin.x;
         y -= (int)parent.origin.y;
     }

-    
+

 }
 
 void wxMacControl::GetSize( int &width, int &height ) const
 }
 
 void wxMacControl::GetSize( int &width, int &height ) const


@@ -1358,7 +1353,7 @@ bool wxMacControl::SetBackgroundStyle(wxBackgroundStyle style)
         OSStatus err = HIViewChangeFeatures(m_controlRef , kHIViewIsOpaque , 0);
         verify_noerr( err );
     }
         OSStatus err = HIViewChangeFeatures(m_controlRef , kHIViewIsOpaque , 0);
         verify_noerr( err );
     }

-    
+

     return true ;
 }
 
     return true ;
 }
 


@@ -1431,7 +1426,7 @@ void wxMacControl::GetRectInWindowCoords( Rect *r )
         OffsetRect( r , (short) hiPoint.x , (short) hiPoint.y ) ;
     }
 }
         OffsetRect( r , (short) hiPoint.x , (short) hiPoint.y ) ;
     }
 }

-        
+

 void wxMacControl::GetBestRect( wxRect *rect ) const
 {
     short   baselineoffset;
 void wxMacControl::GetBestRect( wxRect *rect ) const
 {
     short   baselineoffset;


@@ -1561,6 +1556,6 @@ wxWidgetImplType* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )
     // the root control level handler
     if ( !now->IsNativeWindowWrapper() )
         contentview->InstallEventHandler() ;
     // the root control level handler
     if ( !now->IsNativeWindowWrapper() )
         contentview->InstallEventHandler() ;

-    
+

     return contentview;
 }
     return contentview;
 }