Remove wxBevelButton support as it's no loger required for 2.9.

Originally committed to SVN as r3339.

aegisub/src/Makefile.am

@@ -120,10 +120,6 @@ else
 UNIVCHARSET = charset_detect.cpp text_file_reader.cpp
 endif
 
-#if BUILD_DARWIN
-#  BEVEL_BUTTON = osx_bevelButton.cpp
-#endif
-
 if FONTLISTER_FREETYPE
   FONT_LISTER = font_file_lister_freetype.cpp
 endif
@@ -149,7 +145,6 @@ EXTRA_aegisub_2_2_SOURCES = \
 	auto4_lua_scriptreader.cpp \
 	avisynth_wrap.cpp \
 	dialog_associations.cpp \
-	osx_bevelButton.cpp \
 	setup.cpp \
 	spellchecker_hunspell.cpp \
 	stdwx.cpp \
@@ -164,7 +159,6 @@ aegisub_2_2_SOURCES = \
 	$(HUNSPELL) \
 	$(LIBASS) \
 	$(UNIVCHARSET) \
-	$(BEVEL_BUTTON) \
 	font_file_lister.cpp \
 	$(FONT_LISTER) \
 	MatroskaParser.c \
@@ -314,6 +308,4 @@ aegisub_2_2_SOURCES += \
 noinst_HEADERS = \
 	$(srcdir)/boost/*.hpp \
 	gl/glext.h \
-	$(srcdir)/*.hxx \
+	$(srcdir)/*.hxx
-	osx_bevelButton.h
-

aegisub/src/audio_box.cpp

@@ -56,11 +56,6 @@
 
 
 
-//#ifdef __WXMAC__
-//#include "bevelButton.h"
-//#endif
-
-
 /// @brief Constructor 
 /// @param parent 
 ///
@@ -208,12 +203,7 @@ wxPanel(parent,-1,wxDefaultPosition,wxDefaultSize,wxTAB_TRAVERSAL|wxBORDER_RAISE
 	KaraokeButton = new wxToggleButton(this,Audio_Button_Karaoke,_("Karaoke"),wxDefaultPosition,wxSize(-1,-1));
 	KaraokeButton->SetToolTip(_("Toggle karaoke mode"));
 	karaokeSizer->Add(KaraokeButton,0,wxRIGHT|wxEXPAND,0);
-//#ifndef __WXMAC__
 	JoinButton = new wxButton(this,Audio_Button_Join,_T(""),wxDefaultPosition,wxSize(-1,10));
-//#else
-	// we use this custom class to match the button style of toggle buttons in wxMac
-//	JoinButton = new wxBevelButton(this,Audio_Button_Join,_T(""),wxDefaultPosition,wxSize(-1,-1));
-//#endif
 	karaokeSizer->Add(JoinButton,0,wxRIGHT|wxEXPAND,0);
 	SplitButton = new wxButton(this,Audio_Button_Split,_T(""),wxDefaultPosition,wxSize(-1,-1));
 	karaokeSizer->Add(SplitButton,0,wxRIGHT|wxEXPAND,5);

aegisub/src/osx_bevelButton.cpp

@@ -1,95 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        bevelButton.cpp
-// Purpose:     wxBevelButton, a button that looks like a toggle button in wxMac
-// Author:      David Conrad
-// Modified by:
-// Created:     2006-06-16
-// RCS-ID:      $Id$
-// Copyright:   (c) David Conrad
-// Licence:       wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "config.h"
-
-#ifdef __WXMAC__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "osx_bevelButton.h"
-#endif
-
-#include "wx/wxprec.h"
-
-#include "osx_bevelButton.h"
-#include "wx/panel.h"
-#include "wx/stockitem.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxBevelButton, wxControl)
-
-#include "wx/mac/uma.h"
-// Button
-
-
-/// DOCME
-static const int kMacOSXHorizontalBorder = 2 ;
-
-/// DOCME
-static const int kMacOSXVerticalBorder = 4 ;
-
-
-/// @brief DOCME
-/// @param parent    
-/// @param id        
-/// @param lbl       
-/// @param pos       
-/// @param size      
-/// @param style     
-/// @param validator 
-/// @param name      
-/// @return 
-///
-bool wxBevelButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl,
-						   const wxPoint& pos,
-						   const wxSize& size, long style,
-						   const wxValidator& validator,
-						   const wxString& name)
-{
-    wxString label(lbl);
-    if (label.empty() && wxIsStockID(id))
-        label = wxGetStockLabel(id);
-    
-    m_macIsUserPane = FALSE ;
-    
-    if ( !wxButtonBase::Create(parent, id, pos, size, style, validator, name) )
-        return false;
-    
-    m_label = label ;
-	
-    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
-    m_peer = new wxMacControl(this) ;
-
-	verify_noerr ( CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , 
-		 kControlBevelButtonNormalBevel , 0 , NULL , 0 , 0 , 0 , m_peer->GetControlRefAddr() ) );
-
-    MacPostControlCreate(pos,size) ;
-    
-	return TRUE;
-}
-
-
-/// @brief DOCME
-///
-wxSize wxBevelButton::DoGetBestSize() const
-{
-    int wBtn = 70 ; 
-    int hBtn = 20 ;
-	
-    int lBtn = m_label.Length() * 8 + 12 ;
-    if (lBtn > wBtn) 
-        wBtn = lBtn;
-	
-    return wxSize ( wBtn , hBtn ) ;
-}
-
-#endif // __WXMAC__
-
-

aegisub/src/osx_bevelButton.h

@@ -1,75 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        bevelButton.h
-// Purpose:     wxBevelButton class, a button that looks like Toggle buttons in wxMac
-// Author:      David Conrad
-// Modified by:
-// Created:     2006-06-16
-// RCS-ID:      $Id$
-// Copyright:   (c) David Conrad
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __WXMAC__
-
-#ifndef _WX_BEVEL_BUTTON_H_
-
-/// DOCME
-#define _WX_BEVEL_BUTTON_H_
-
-#include "wx/control.h"
-#include "wx/gdicmn.h"
-
-//WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
-
-
-/// DOCME
-/// @class wxBevelButton
-/// @brief DOCME
-///
-/// DOCME
-class WXDLLEXPORT wxBevelButton: public wxButton
-{
-	DECLARE_DYNAMIC_CLASS(wxButton)
-public:
-
-	/// @brief DOCME
-	///
-	inline wxBevelButton() {}
-
-	/// @brief DOCME
-	/// @param parent             
-	/// @param id                 
-	/// @param wxEmptyString      
-	/// @param wxDefaultPosition  
-	/// @param wxDefaultSize      
-	/// @param 0                  
-	/// @param wxDefaultValidator 
-	/// @param wxButtonNameStr    
-	///
-	inline wxBevelButton(wxWindow *parent, wxWindowID id,
-						 const wxString& label = wxEmptyString,
-						 const wxPoint& pos = wxDefaultPosition,
-						 const wxSize& size = wxDefaultSize, long style = 0,
-						 const wxValidator& validator = wxDefaultValidator,
-						 const wxString& name = wxButtonNameStr)
-{
-		Create(parent, id, label, pos, size, style, validator, name);
-}
-
-bool Create(wxWindow *parent, wxWindowID id,
-			const wxString& label = wxEmptyString,
-			const wxPoint& pos = wxDefaultPosition,
-			const wxSize& size = wxDefaultSize, long style = 0,
-			const wxValidator& validator = wxDefaultValidator,
-			const wxString& name = wxButtonNameStr);
-
-protected:
-virtual wxSize DoGetBestSize() const ;
-};
-
-#endif
-// _WX_BUTTON_H_
-
-#endif // __WXMAC__
-
-

aegisub/src/subs_edit_box.cpp

@@ -62,7 +62,6 @@
 #include "dialog_search_replace.h"
 #include "idle_field_event.h"
 #include "tooltip_manager.h"
-#include "osx_bevelButton.h"
 #include "libresrc/libresrc.h"
 
 
@@ -140,11 +139,7 @@ SubsEditBox::SubsEditBox (wxWindow *parent,SubtitlesGrid *gridp) : wxPanel(paren
 	Color3->SetToolTip(_("Outline color"));
 	Color4 = new wxBitmapButton(this,BUTTON_COLOR4,GETIMAGE(button_color_four_24),wxDefaultPosition,wxSize(30,20));
 	Color4->SetToolTip(_("Shadow color"));
-#ifdef __WXMAC__
-	CommitButton = new wxBevelButton(this,BUTTON_COMMIT,_("Commit"),wxDefaultPosition,wxDefaultSize);
-#else
 	CommitButton = new wxButton(this,BUTTON_COMMIT,_("Commit"),wxDefaultPosition,wxDefaultSize);
-#endif
 	ToolTipManager::Bind(CommitButton,_("Commits the text (Enter). Hold Ctrl to stay in line (%KEY%)."),_T("Edit Box Commit"));
 	ByTime = new wxRadioButton(this,RADIO_TIME_BY_TIME,_("Time"),wxDefaultPosition,wxDefaultSize,wxRB_GROUP);
 	ByTime->SetToolTip(_("Time by h:mm:ss.cs"));