Remove a bunch of __WXMAC__ entries that are no longer required.

* Options uses a TreeBook like every other platform
 * Browse button now works in osx
 * wxGLCanvas is now the same as windows/unix

Originally committed to SVN as r3484.
This commit is contained in:
Amar Takhar 2009-09-05 01:16:23 +00:00
parent 878f451d72
commit 2d96c5bf4b
4 changed files with 2 additions and 8 deletions

View file

@ -84,14 +84,12 @@ void BrowseButton::OnPressed(wxCommandEvent &event) {
// Folder
if (type == BROWSE_FOLDER) {
// For some reason I can't make this work on Mac... -jfs
#ifndef __WXMAC__
wxString def = StandardPaths::DecodePathMaybeRelative(ctrl[0]->GetValue(), _T("?user/"));
wxDirDialog dlg(0, _("Please choose the folder:"), def);
if (dlg.ShowModal() == wxID_OK) {
wxString dir = StandardPaths::EncodePath(dlg.GetPath());
if (dir != _T("")) ctrl[0]->SetValue(dir);
}
#endif
}
// File

View file

@ -40,7 +40,7 @@
#include "config.h"
#include "dialog_options.h"
#if wxUSE_TREEBOOK && !__WXMAC__
#if wxUSE_TREEBOOK
#include <wx/treebook.h>
#else

View file

@ -53,7 +53,7 @@
// Prototypes
class FrameMain;
class DialogInputHotkey;
#if wxUSE_TREEBOOK && !__WXMAC__
#if wxUSE_TREEBOOK
class wxTreebook;
#else
#include <wx/choicebk.h>

View file

@ -133,11 +133,7 @@ int attribList[] = { WX_GL_RGBA , WX_GL_DOUBLEBUFFER, WX_GL_STENCIL_SIZE, 8, 0 }
/// @param name
///
VideoDisplay::VideoDisplay(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name)
#ifdef __WXMAC__
: wxGLCanvas (parent, id, pos, size, style, name, attribList)
#else
: wxGLCanvas (parent, id, attribList, pos, size, style, name)
#endif
{
// Set options
box = NULL;