git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39034
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
19 files changed:
#include "wx/colour.h"
#include "wx/settings.h"
#include "wx/log.h"
#include "wx/colour.h"
#include "wx/settings.h"
#include "wx/log.h"
#endif
#include "wx/containr.h"
#endif
#include "wx/containr.h"
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
// wxWin macros
#ifndef WX_PRECOMP
#include "wx/utils.h"
#ifndef WX_PRECOMP
#include "wx/utils.h"
#endif
#include "wx/dcclient.h"
#endif
#include "wx/dcclient.h"
#if wxUSE_TIMER
#include "wx/timer.h"
#endif
#if wxUSE_TIMER
#include "wx/timer.h"
#endif
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/imaglist.h"
#include "wx/bitmap.h"
#include "wx/fontutil.h"
#include "wx/imaglist.h"
#include "wx/bitmap.h"
#include "wx/fontutil.h"
/* set the label text */
nb_page->m_text = text;
/* set the label text */
nb_page->m_text = text;
- if (nb_page->m_text.empty()) nb_page->m_text = wxT("");
+ if (nb_page->m_text.empty()) nb_page->m_text = wxEmptyString;
nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) );
gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding );
nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) );
gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding );
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/utils.h"
#endif
#include "wx/math.h"
#include "wx/settings.h"
#endif
#include "wx/math.h"
#include "wx/settings.h"
#include "wx/strconv.h"
#include "wx/fontutil.h" // for wxNativeFontInfo (GetNativeFontInfo())
#include "wx/strconv.h"
#include "wx/fontutil.h" // for wxNativeFontInfo (GetNativeFontInfo())
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/imaglist.h"
#include "wx/bitmap.h"
#include "wx/fontutil.h"
#include "wx/imaglist.h"
#include "wx/bitmap.h"
#include "wx/fontutil.h"
/* set the label text */
nb_page->m_text = text;
/* set the label text */
nb_page->m_text = text;
- if (nb_page->m_text.empty()) nb_page->m_text = wxT("");
+ if (nb_page->m_text.empty()) nb_page->m_text = wxEmptyString;
nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) );
gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding );
nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) );
gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding );
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/utils.h"
#endif
#include "wx/math.h"
#include "wx/settings.h"
#endif
#include "wx/math.h"
#include "wx/settings.h"
#include "wx/strconv.h"
#include "wx/fontutil.h" // for wxNativeFontInfo (GetNativeFontInfo())
#include "wx/strconv.h"
#include "wx/fontutil.h" // for wxNativeFontInfo (GetNativeFontInfo())
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/mac/carbon/button.cpp
// Purpose: wxButton
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Purpose: wxButton
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
#include "wx/button.h"
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
#include "wx/button.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/panel.h"
+#endif
+
#include "wx/stockitem.h"
#include "wx/mac/uma.h"
#include "wx/stockitem.h"
#include "wx/mac/uma.h"
Rect bestsize = { 0 , 0 , 0 , 0 } ;
m_peer->GetBestRect( &bestsize ) ;
Rect bestsize = { 0 , 0 , 0 , 0 } ;
m_peer->GetBestRect( &bestsize ) ;
int wBtn;
if ( EmptyRect( &bestsize ) )
{
int wBtn;
if ( EmptyRect( &bestsize ) )
{
- wBtn = m_label.Length() * charspace + 12 ;
+ wBtn = m_label.length() * charspace + 12 ;
sz.y = bestsize.bottom - bestsize.top ;
}
sz.y = bestsize.bottom - bestsize.top ;
}
- if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT))
+ if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT))
wxSize wxButton::GetDefaultSize()
{
wxSize wxButton::GetDefaultSize()
{
int hBtn = 20 ;
return wxSize(wBtn, hBtn);
int hBtn = 20 ;
return wxSize(wBtn, hBtn);
-wxInt32 wxButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
+wxInt32 wxButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
{
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId);
event.SetEventObject(this);
{
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId);
event.SetEventObject(this);
#ifndef WX_PRECOMP
#include "wx/app.h"
#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/notebook.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/notebook.h"
#include "wx/log.h"
#include "wx/app.h"
#include "wx/utils.h"
#include "wx/log.h"
#include "wx/app.h"
#include "wx/utils.h"
#endif
#include "wx/menu.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#endif
#include "wx/menu.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/layout.h"
#include "wx/dialog.h"
#include "wx/scrolbar.h"
#include "wx/layout.h"
#include "wx/dialog.h"
#include "wx/scrolbar.h"
#endif
#include "wx/button.h"
#endif
#include "wx/button.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/panel.h"
+#endif
+
#include "wx/stockitem.h"
IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
#include "wx/stockitem.h"
IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
{
wxSize sz = GetDefaultSize() ;
{
wxSize sz = GetDefaultSize() ;
- int wBtn = m_label.Length() * 8 + 12 + 2 * kMacOSXHorizontalBorder ;
+ int wBtn = m_label.length() * 8 + 12 + 2 * kMacOSXHorizontalBorder ;
if (wBtn > sz.x) sz.x = wBtn;
if (wBtn > sz.x) sz.x = wBtn;
#ifndef WX_PRECOMP
#include "wx/app.h"
#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/notebook.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/notebook.h"
#include "wx/log.h"
#include "wx/app.h"
#include "wx/utils.h"
#include "wx/log.h"
#include "wx/app.h"
#include "wx/utils.h"
#endif
#include "wx/menu.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#endif
#include "wx/menu.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/layout.h"
#include "wx/dialog.h"
#include "wx/listbox.h"
#include "wx/layout.h"
#include "wx/dialog.h"
#include "wx/listbox.h"
#ifndef WX_PRECOMP
#include "wx/utils.h"
#ifndef WX_PRECOMP
#include "wx/utils.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/utils.h"
#endif
#include "wx/settings.h"
#endif
#include "wx/settings.h"
#include "wx/clipbrd.h"
#include "wx/tokenzr.h"
#include "wx/dcclient.h"
#include "wx/clipbrd.h"
#include "wx/tokenzr.h"
#include "wx/dcclient.h"
#include "wx/log.h"
#include "wx/app.h"
#include "wx/utils.h"
#include "wx/log.h"
#include "wx/app.h"
#include "wx/utils.h"
#endif
#include "wx/menu.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#endif
#include "wx/menu.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/layout.h"
#include "wx/dialog.h"
#include "wx/listbox.h"
#include "wx/layout.h"
#include "wx/dialog.h"
#include "wx/listbox.h"
#if wxUSE_XRC
#include "wx/xrc/xh_panel.h"
#if wxUSE_XRC
#include "wx/xrc/xh_panel.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/panel.h"
+#endif
+
#include "wx/frame.h"
IMPLEMENT_DYNAMIC_CLASS(wxPanelXmlHandler, wxXmlResourceHandler)
#include "wx/frame.h"
IMPLEMENT_DYNAMIC_CLASS(wxPanelXmlHandler, wxXmlResourceHandler)
#ifndef WX_PRECOMP
#include "wx/log.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif
#include "wx/sizer.h"
#include "wx/gbsizer.h"
#include "wx/statbox.h"
#include "wx/notebook.h"
#endif
#include "wx/sizer.h"
#include "wx/gbsizer.h"
#include "wx/statbox.h"
#include "wx/notebook.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/window.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/window.h"
#endif
#include "wx/sizer.h"
#endif
#include "wx/sizer.h"
class wxUnknownControlContainer : public wxPanel
class wxUnknownControlContainer : public wxPanel
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#endif
#ifndef __WXWINCE__
#endif
#ifndef __WXWINCE__
#endif
#include "wx/dialog.h"
#endif
#include "wx/dialog.h"
#include "wx/frame.h"
#include "wx/wfstream.h"
#include "wx/filesys.h"
#include "wx/frame.h"
#include "wx/wfstream.h"
#include "wx/filesys.h"