diff --git a/checkin_notes b/checkin_notes
index 9df265b6e9..096ea98829 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -11760,11 +11760,18 @@ Rom    29 Oct 2006
 
 Charlie 29 Oct 2006
     - Mac: fix some Mac-specific Simple GUI bugs. 
+    - NOTE: wxNO_BORDER is not a valid style argument for wxBitmapButton 
+        constructors; use wxBU_NOAUTODRAW instead.
     - Mac: Don't run confirmation dialog on QUIT AppleEvent so dialog 
         doesn't prevent logout / shutdown.
+    - Mac: fix crash on Mac when creating SG preferences dialog: create 
+        window before setting background color. 
 
     clientgui/
         AdvancedFrame.cpp, h
         BOINCBaseFrame.cpp, .h
         BOINCGUIApp.cpp, .h
         sg_BoincSimpleGUI.cpp
+        sg_DlgMessages.cpp
+        sg_DlgPreferences.cpp
+        sg_ProjectsComponent.cpp
diff --git a/clientgui/sg_DlgMessages.cpp b/clientgui/sg_DlgMessages.cpp
index c7e99ccae4..dbf8d6132f 100644
--- a/clientgui/sg_DlgMessages.cpp
+++ b/clientgui/sg_DlgMessages.cpp
@@ -112,7 +112,7 @@ void CDlgMessages::CreateDialog()
     SetBackgroundColour(*pSkinSimple->GetBackgroundImage()->GetBackgroundColor());
 	
 	wxToolTip *ttClose = new wxToolTip(_("Close message window"));
-    btnClose=new wxBitmapButton(this,ID_CLOSEBUTTON,*(pSkinSimple->GetCloseButton()->GetBitmap()),wxPoint(472,398),wxSize(57,16),wxNO_BORDER);
+    btnClose=new wxBitmapButton(this,ID_CLOSEBUTTON,*(pSkinSimple->GetCloseButton()->GetBitmap()),wxPoint(472,398),wxSize(57,16),wxBU_NOAUTODRAW);
     btnClose->SetBitmapSelected(*(pSkinSimple->GetCloseButton()->GetBitmapClicked()));
 	btnClose->SetToolTip(ttClose);
 	
diff --git a/clientgui/sg_DlgPreferences.cpp b/clientgui/sg_DlgPreferences.cpp
index dce22cc5cb..1e19441ebd 100644
--- a/clientgui/sg_DlgPreferences.cpp
+++ b/clientgui/sg_DlgPreferences.cpp
@@ -228,13 +228,13 @@ bool CDlgPreferences::Create( wxWindow* parent, wxWindowID id, const wxString& c
     m_WorkWhenIdleCtrl = NULL;
 ////@end CDlgPreferences member initialisation
 
+    wxDialog::Create( parent, id, caption, pos, size, style );
 #ifdef __WXDEBUG__
     SetBackgroundColour(wxColour(255, 0, 255));
 #endif
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);
     SetForegroundColour(*wxBLACK);
     SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
-    wxDialog::Create( parent, id, caption, pos, size, style );
 
     Freeze();
 
@@ -455,11 +455,11 @@ void CDlgPreferences::CreateControls()
     wxBoxSizer* itemBoxSizer44 = new wxBoxSizer(wxHORIZONTAL);
     itemBoxSizer2->Add(itemBoxSizer44, 0, wxALIGN_RIGHT|wxALL, 5);
 
-    wxBitmapButton* itemBitmapButton44 = new wxBitmapButton( itemDialog1, wxID_OK, *pSkinSimple->GetSaveButton()->GetBitmap(), wxDefaultPosition, wxDefaultSize, wxNO_BORDER );
+    wxBitmapButton* itemBitmapButton44 = new wxBitmapButton( itemDialog1, wxID_OK, *pSkinSimple->GetSaveButton()->GetBitmap(), wxDefaultPosition, wxDefaultSize, wxBU_NOAUTODRAW );
     itemBitmapButton44->SetBitmapSelected(*pSkinSimple->GetSaveButton()->GetBitmapClicked());
     itemBoxSizer44->Add(itemBitmapButton44, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxBitmapButton* itemBitmapButton45 = new wxBitmapButton( itemDialog1, wxID_CANCEL, *pSkinSimple->GetCancelButton()->GetBitmap(), wxDefaultPosition, wxDefaultSize, wxNO_BORDER );
+    wxBitmapButton* itemBitmapButton45 = new wxBitmapButton( itemDialog1, wxID_CANCEL, *pSkinSimple->GetCancelButton()->GetBitmap(), wxDefaultPosition, wxDefaultSize, wxBU_NOAUTODRAW );
     itemBitmapButton45->SetBitmapSelected(*pSkinSimple->GetCancelButton()->GetBitmapClicked());
     itemBoxSizer44->Add(itemBitmapButton45, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
diff --git a/clientgui/sg_ProjectsComponent.cpp b/clientgui/sg_ProjectsComponent.cpp
index 166ec5f5e4..6f5ab6919f 100644
--- a/clientgui/sg_ProjectsComponent.cpp
+++ b/clientgui/sg_ProjectsComponent.cpp
@@ -99,7 +99,7 @@ void CProjectsComponent::CreateComponent()
         *pSkinSimple->GetAttachProjectButton()->GetBitmap(),
         wxPoint(235,7),
         wxSize(81,18),
-        wxNO_BORDER
+        wxBU_NOAUTODRAW
     );
 	btnAddProj->SetBitmapSelected(
         *pSkinSimple->GetAttachProjectButton()->GetBitmapClicked()
@@ -143,7 +143,7 @@ void CProjectsComponent::CreateComponent()
         *(pSkinSimple->GetLeftArrowButton()->GetBitmap()),
         wxPoint(29,47),
         wxSize(20,20),
-        wxNO_BORDER
+        wxBU_NOAUTODRAW
     );
     btnArwLeft->SetBitmapSelected(*(pSkinSimple->GetLeftArrowButton()->GetBitmapClicked()));
     btnArwLeft->Show(false);//on creation this one is always false
@@ -154,7 +154,7 @@ void CProjectsComponent::CreateComponent()
         *(pSkinSimple->GetRightArrowButton()->GetBitmap()),
         wxPoint(301,47),
         wxSize(20,20),
-        wxNO_BORDER
+        wxBU_NOAUTODRAW
     );
     btnArwRight->SetBitmapSelected(*(pSkinSimple->GetRightArrowButton()->GetBitmapClicked()));
 
@@ -173,7 +173,7 @@ void CProjectsComponent::CreateComponent()
         *(pSkinSimple->GetMessagesLink()->GetBitmap()),
         wxPoint(11,86),
         wxSize(70,20),
-        wxNO_BORDER
+        wxBU_NOAUTODRAW
     );
 	btnMessages->SetBitmapSelected(*(pSkinSimple->GetMessagesLink()->GetBitmap()));
 	btnMessages->SetToolTip(ttMessages);
@@ -185,7 +185,7 @@ void CProjectsComponent::CreateComponent()
         *(pSkinSimple->GetMessagesAlertLink()->GetBitmap()),
         wxPoint(11,86),
         wxSize(70,20),
-        wxNO_BORDER
+        wxBU_NOAUTODRAW
     );
 	btnAlertMessages->SetBitmapSelected(*(pSkinSimple->GetMessagesAlertLink()->GetBitmap()));
 	btnAlertMessages->SetToolTip(ttAlertMessages);
@@ -204,7 +204,7 @@ void CProjectsComponent::CreateComponent()
         *(pSkinSimple->GetSuspendLink()->GetBitmap()),
         wxPoint(85,86),
         wxSize(59,20),
-        wxNO_BORDER
+        wxBU_NOAUTODRAW
     );
 	btnPause->SetBitmapSelected(*(pSkinSimple->GetSuspendLink()->GetBitmap()));
 	btnPause->SetToolTip(ttPause);
@@ -217,7 +217,7 @@ void CProjectsComponent::CreateComponent()
         *(pSkinSimple->GetResumeLink()->GetBitmap()),
         wxPoint(85,86),
         wxSize(59,20),
-        wxNO_BORDER
+        wxBU_NOAUTODRAW
     );
 	btnResume->SetBitmapSelected(*(pSkinSimple->GetResumeLink()->GetBitmap()));
 	btnResume->SetToolTip(ttResume);
@@ -246,7 +246,7 @@ void CProjectsComponent::CreateComponent()
         *(pSkinSimple->GetPreferencesLink()->GetBitmap()),
         wxPoint(149,86),
         wxSize(81,20),
-        wxNO_BORDER
+        wxBU_NOAUTODRAW
     );
 	btnPreferences->SetBitmapSelected(*(pSkinSimple->GetPreferencesLink()->GetBitmap()));
 	btnPreferences->SetToolTip(ttPreferences);
@@ -264,7 +264,7 @@ void CProjectsComponent::CreateComponent()
         *(pSkinSimple->GetAdvancedLink()->GetBitmap()),
         wxPoint(233,86),
         wxSize(101,20),
-        wxNO_BORDER
+        wxBU_NOAUTODRAW
     );
     btnAdvancedView->SetBitmapSelected(*(pSkinSimple->GetAdvancedLink()->GetBitmap()));
 	btnAdvancedView->SetToolTip(ttAdvView);