Added wxSearchCtrl::[Get|Set]DescriptiveText

[wxWidgets.git] / src / mac / carbon / drawer.cpp

diff --git a/src/mac/carbon/drawer.cpp b/src/mac/carbon/drawer.cpp
index 692a033ce9d032302340c2545acd48d5cf0db6e7..605aad98ab82f693360acefb570c3d70ff994faa 100644 (file)
--- a/src/mac/carbon/drawer.cpp
+++ b/src/mac/carbon/drawer.cpp
@@ -4,28 +4,25 @@
 //              Drawer windows appear under their parent window and
 //              behave like a drawer, opening and closing to reveal
 //              content that does not need to be visible at all times.
 //              Drawer windows appear under their parent window and
 //              behave like a drawer, opening and closing to reveal
 //              content that does not need to be visible at all times.

-// Author:      Jason Bagley & Ryan Norton 
-// Modified by: 
+// Author:      Jason Bagley 
+// Modified by: Ryan Norton (To make it work :), plus bug fixes)

 // Created:     2004-30-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Jason Bagley; Art & Logic, Inc.
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Created:     2004-30-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Jason Bagley; Art & Logic, Inc.
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "control.h"
-#endif
+#include "wx/wxprec.h"

 
 

-#include "wx/defs.h"
-
-#include "wx/mac/carbon/drawer.h"

 #include "wx/mac/private.h"
 
 #if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
 
 #include "wx/mac/private.h"
 
 #if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
 

+#include "wx/mac/carbon/drawer.h"
+

 IMPLEMENT_DYNAMIC_CLASS(wxDrawerWindow, wxWindow)
 
 IMPLEMENT_DYNAMIC_CLASS(wxDrawerWindow, wxWindow)
 

-// Use consants for now.
+// Use constants for now.

 // These can be made into member variables and set dynamically.
 const int kLeadingOffset = 20;
 const int kTrailingOffset = 20;
 // These can be made into member variables and set dynamically.
 const int kLeadingOffset = 20;
 const int kTrailingOffset = 20;


@@ -52,7 +49,7 @@ bool wxDrawerWindow::Create(wxWindow *parent,
  wxWindowID id, const wxString& title,
  wxSize size, wxDirection edge, const wxString& name)
 {
  wxWindowID id, const wxString& title,
  wxSize size, wxDirection edge, const wxString& name)
 {

-    wxASSERT_MSG(NULL != parent, "wxDrawerWindows must be attached to a parent window.");
+    wxASSERT_MSG(NULL != parent, wxT("wxDrawerWindows must be attached to a parent window."));

        
     // Constrain the drawer size to the parent window.
     const wxSize parentSize(parent->GetClientSize());
        
     // Constrain the drawer size to the parent window.
     const wxSize parentSize(parent->GetClientSize());