Fixed wxAtomicInc/Dec() to not use asm/atomic.h header on Linux - it's kernel interna...

[wxWidgets.git] / src / generic / srchctlg.cpp

diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index 75f939189239593dfd3f4f5be92026e6eff2a59e..fc5adf6dee80f9b7cc0232ce6e0a88ab4c51a85c 100644 (file)
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -68,17 +68,17 @@ static wxColor wxStepColour(const wxColor& c, int ialpha)
 {
     if (ialpha == 100)
         return c;
 {
     if (ialpha == 100)
         return c;

-        
+

     double r = c.Red(), g = c.Green(), b = c.Blue();
     double bg;
     double r = c.Red(), g = c.Green(), b = c.Blue();
     double bg;

-    
+

     // ialpha is 0..200 where 0 is completely black
     // and 200 is completely white and 100 is the same
     // convert that to normal alpha 0.0 - 1.0
     ialpha = wxMin(ialpha, 200);
     ialpha = wxMax(ialpha, 0);
     double alpha = ((double)(ialpha - 100.0))/100.0;
     // ialpha is 0..200 where 0 is completely black
     // and 200 is completely white and 100 is the same
     // convert that to normal alpha 0.0 - 1.0
     ialpha = wxMin(ialpha, 200);
     ialpha = wxMax(ialpha, 0);
     double alpha = ((double)(ialpha - 100.0))/100.0;

-    
+

     if (ialpha > 100)
     {
         // blend with white
     if (ialpha > 100)
     {
         // blend with white


@@ -91,11 +91,11 @@ static wxColor wxStepColour(const wxColor& c, int ialpha)
         bg = 0.0;
         alpha = 1.0 + alpha;  // 0 = transparent fg; 1 = opaque fg
     }
         bg = 0.0;
         alpha = 1.0 + alpha;  // 0 = transparent fg; 1 = opaque fg
     }

-    
+

     r = wxBlendColour(r, bg, alpha);
     g = wxBlendColour(g, bg, alpha);
     b = wxBlendColour(b, bg, alpha);
     r = wxBlendColour(r, bg, alpha);
     g = wxBlendColour(g, bg, alpha);
     b = wxBlendColour(b, bg, alpha);

-    
+

     return wxColour((unsigned char)r, (unsigned char)g, (unsigned char)b);
 }
 
     return wxColour((unsigned char)r, (unsigned char)g, (unsigned char)b);
 }
 


@@ -114,7 +114,7 @@ public:
     {
         m_search = search;
         m_defaultFG = GetForegroundColour();
     {
         m_search = search;
         m_defaultFG = GetForegroundColour();

-        
+

         // remove the default minsize, the searchctrl will have one instead
         SetSizeHints(wxDefaultCoord,wxDefaultCoord);
     }
         // remove the default minsize, the searchctrl will have one instead
         SetSizeHints(wxDefaultCoord,wxDefaultCoord);
     }


@@ -123,17 +123,17 @@ public:
     {
         if ( GetValue() == m_descriptiveText )
         {
     {
         if ( GetValue() == m_descriptiveText )
         {

-            SetValue(wxEmptyString);
+            ChangeValue(wxEmptyString);

         }
         }

-        
+

         m_descriptiveText = text;
     }
         m_descriptiveText = text;
     }

-    
+

     wxString GetDescriptiveText() const
     {
         return m_descriptiveText;
     }
     wxString GetDescriptiveText() const
     {
         return m_descriptiveText;
     }

-    
+

 protected:
     void OnText(wxCommandEvent& eventText)
     {
 protected:
     void OnText(wxCommandEvent& eventText)
     {


@@ -163,7 +163,7 @@ protected:
     {
         if ( IsEmpty() && !(wxWindow::FindFocus() == this) )
         {
     {
         if ( IsEmpty() && !(wxWindow::FindFocus() == this) )
         {

-            SetValue(m_descriptiveText);
+            ChangeValue(m_descriptiveText);

             SetInsertionPoint(0);
             SetForegroundColour(wxStepColour(m_defaultFG, LIGHT_STEP));
         }
             SetInsertionPoint(0);
             SetForegroundColour(wxStepColour(m_defaultFG, LIGHT_STEP));
         }


@@ -174,16 +174,16 @@ protected:
         event.Skip();
         if ( GetValue() == m_descriptiveText )
         {
         event.Skip();
         if ( GetValue() == m_descriptiveText )
         {

-            SetValue(wxEmptyString);
+            ChangeValue(wxEmptyString);

             SetForegroundColour(m_defaultFG);
         }
     }
             SetForegroundColour(m_defaultFG);
         }
     }

-    
+

 private:
     wxSearchCtrl* m_search;
     wxString      m_descriptiveText;
     wxColour      m_defaultFG;
 private:
     wxSearchCtrl* m_search;
     wxString      m_descriptiveText;
     wxColour      m_defaultFG;

-    
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -228,11 +228,13 @@ protected:
 
         m_search->SetFocus();
 
 
         m_search->SetFocus();
 

+#if wxUSE_MENUS

         if ( m_eventType == wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN )
         {
             // this happens automatically, just like on Mac OS X
             m_search->PopupSearchMenu();
         }
         if ( m_eventType == wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN )
         {
             // this happens automatically, just like on Mac OS X
             m_search->PopupSearchMenu();
         }

+#endif // wxUSE_MENUS

     }
 
     void OnPaint(wxPaintEvent&)
     }
 
     void OnPaint(wxPaintEvent&)


@@ -294,17 +296,21 @@ wxSearchCtrl::wxSearchCtrl(wxWindow *parent, wxWindowID id,
 
 void wxSearchCtrl::Init()
 {
 
 void wxSearchCtrl::Init()
 {

-    m_text = 0;
-    m_searchButton = 0;
-    m_cancelButton = 0;
-    m_menu = 0;
+    m_text = NULL;
+    m_searchButton = NULL;
+    m_cancelButton = NULL;
+#if wxUSE_MENUS
+    m_menu = NULL;
+#endif // wxUSE_MENUS

 
     m_searchButtonVisible = true;
     m_cancelButtonVisible = false;
 
 
     m_searchButtonVisible = true;
     m_cancelButtonVisible = false;
 

-    m_searchMenuBitmapUser = false;

     m_searchBitmapUser = false;
     m_cancelBitmapUser = false;
     m_searchBitmapUser = false;
     m_cancelBitmapUser = false;

+#if wxUSE_MENUS
+    m_searchMenuBitmapUser = false;
+#endif // wxUSE_MENUS

 }
 
 bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,


@@ -315,22 +321,35 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
             const wxValidator& validator,
             const wxString& name)
 {
             const wxValidator& validator,
             const wxString& name)
 {

+    // force border style for more native appearance
+    style &= ~wxBORDER_MASK;

 #ifdef __WXGTK__
 #ifdef __WXGTK__

-    if ( !wxTextCtrlBase::Create(parent, id, pos, size, wxSUNKEN_BORDER | style, validator, name) )
+    style |= wxBORDER_SUNKEN;
+#elif defined(__WXMSW__)
+    // Don't set the style explicitly, let GetDefaultBorder() work it out, unless
+    // we will get a sunken border (e.g. on Windows 200) in which case we must
+    // override with a simple border.
+    if (GetDefaultBorder() == wxBORDER_SUNKEN)
+        style |= wxBORDER_SIMPLE;

 #else
 #else

-    if ( !wxTextCtrlBase::Create(parent, id, pos, size, wxSIMPLE_BORDER | style, validator, name) )
+    style |= wxBORDER_SIMPLE;

 #endif
 #endif

+    if ( !wxTextCtrlBase::Create(parent, id, pos, size, style, validator, name) )

     {
         return false;
     }
 
     m_text = new wxSearchTextCtrl(this, value, style & ~wxBORDER_MASK);
     m_text->SetDescriptiveText(_("Search"));
     {
         return false;
     }
 
     m_text = new wxSearchTextCtrl(this, value, style & ~wxBORDER_MASK);
     m_text->SetDescriptiveText(_("Search"));

-    
+

     wxSize sizeText = m_text->GetBestSize();
 
     wxSize sizeText = m_text->GetBestSize();
 

-    m_searchButton = new wxSearchButton(this,wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN,m_searchBitmap);
-    m_cancelButton = new wxSearchButton(this,wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN,m_cancelBitmap);
+    m_searchButton = new wxSearchButton(this,
+                                        wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN,
+                                        m_searchBitmap);
+    m_cancelButton = new wxSearchButton(this,
+                                        wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN,
+                                        m_cancelBitmap);

 
     SetForegroundColour( m_text->GetForegroundColour() );
     m_searchButton->SetForegroundColour( m_text->GetForegroundColour() );
 
     SetForegroundColour( m_text->GetForegroundColour() );
     m_searchButton->SetForegroundColour( m_text->GetForegroundColour() );


@@ -352,11 +371,15 @@ wxSearchCtrl::~wxSearchCtrl()
     delete m_text;
     delete m_searchButton;
     delete m_cancelButton;
     delete m_text;
     delete m_searchButton;
     delete m_cancelButton;

+#if wxUSE_MENUS

     delete m_menu;
     delete m_menu;

+#endif // wxUSE_MENUS

 }
 
 
 // search control specific interfaces
 }
 
 
 // search control specific interfaces

+#if wxUSE_MENUS
+

 void wxSearchCtrl::SetMenu( wxMenu* menu )
 {
     if ( menu == m_menu )
 void wxSearchCtrl::SetMenu( wxMenu* menu )
 {
     if ( menu == m_menu )


@@ -382,7 +405,7 @@ void wxSearchCtrl::SetMenu( wxMenu* menu )
         }
     }
     wxRect rect = GetRect();
         }
     }
     wxRect rect = GetRect();

-    LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight());    
+    LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight());

 }
 
 wxMenu* wxSearchCtrl::GetMenu()
 }
 
 wxMenu* wxSearchCtrl::GetMenu()


@@ -390,6 +413,8 @@ wxMenu* wxSearchCtrl::GetMenu()
     return m_menu;
 }
 
     return m_menu;
 }
 

+#endif // wxUSE_MENUS
+

 void wxSearchCtrl::ShowSearchButton( bool show )
 {
     if ( m_searchButtonVisible == show )
 void wxSearchCtrl::ShowSearchButton( bool show )
 {
     if ( m_searchButtonVisible == show )


@@ -452,7 +477,7 @@ wxSize wxSearchCtrl::DoGetBestSize() const
     wxSize sizeCancel(0,0);
     int searchMargin = 0;
     int cancelMargin = 0;
     wxSize sizeCancel(0,0);
     int searchMargin = 0;
     int cancelMargin = 0;

-    if ( m_searchButtonVisible || m_menu )
+    if ( m_searchButtonVisible || HasMenu() )

     {
         sizeSearch = m_searchButton->GetBestSize();
         searchMargin = MARGIN;
     {
         sizeSearch = m_searchButton->GetBestSize();
         searchMargin = MARGIN;


@@ -482,7 +507,7 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
 {
     if ( !m_text )
         return;
 {
     if ( !m_text )
         return;

-    
+

     wxSize sizeText = m_text->GetBestSize();
     // make room for the search menu & clear button
     int horizontalBorder = ( sizeText.y - sizeText.y * 14 / 21 ) / 2;
     wxSize sizeText = m_text->GetBestSize();
     // make room for the search menu & clear button
     int horizontalBorder = ( sizeText.y - sizeText.y * 14 / 21 ) / 2;


@@ -495,7 +520,7 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
     wxSize sizeCancel(0,0);
     int searchMargin = 0;
     int cancelMargin = 0;
     wxSize sizeCancel(0,0);
     int searchMargin = 0;
     int cancelMargin = 0;

-    if ( m_searchButtonVisible || m_menu )
+    if ( m_searchButtonVisible || HasMenu() )

     {
         sizeSearch = m_searchButton->GetBestSize();
         searchMargin = MARGIN;
     {
         sizeSearch = m_searchButton->GetBestSize();
         searchMargin = MARGIN;


@@ -505,7 +530,7 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
         sizeCancel = m_cancelButton->GetBestSize();
         cancelMargin = MARGIN;
     }
         sizeCancel = m_cancelButton->GetBestSize();
         cancelMargin = MARGIN;
     }

-    m_searchButton->Show( m_searchButtonVisible || m_menu );
+    m_searchButton->Show( m_searchButtonVisible || HasMenu() );

     m_cancelButton->Show( m_cancelButtonVisible );
 
     if ( sizeSearch.x + sizeCancel.x > width )
     m_cancelButton->Show( m_cancelButtonVisible );
 
     if ( sizeSearch.x + sizeCancel.x > width )


@@ -515,14 +540,14 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
         searchMargin = 0;
         cancelMargin = 0;
     }
         searchMargin = 0;
         cancelMargin = 0;
     }

-    wxCoord textWidth = width - sizeSearch.x - sizeCancel.x - searchMargin - cancelMargin;
+    wxCoord textWidth = width - sizeSearch.x - sizeCancel.x - searchMargin - cancelMargin - 1;

 
     // position the subcontrols inside the client area
 
     m_searchButton->SetSize(x, y + ICON_OFFSET - 1, sizeSearch.x, height);
 
     // position the subcontrols inside the client area
 
     m_searchButton->SetSize(x, y + ICON_OFFSET - 1, sizeSearch.x, height);

-    m_text->SetSize( x + sizeSearch.x + searchMargin, 
+    m_text->SetSize( x + sizeSearch.x + searchMargin,

                      y + ICON_OFFSET - BORDER,
                      y + ICON_OFFSET - BORDER,

-                     textWidth, 
+                     textWidth,

                      height);
     m_cancelButton->SetSize(x + sizeSearch.x + searchMargin + textWidth + cancelMargin,
                             y + ICON_OFFSET - 1, sizeCancel.x, height);
                      height);
     m_cancelButton->SetSize(x + sizeSearch.x + searchMargin + textWidth + cancelMargin,
                             y + ICON_OFFSET - 1, sizeCancel.x, height);


@@ -803,7 +828,7 @@ void wxSearchCtrl::SetSearchBitmap( const wxBitmap& bitmap )
     m_searchBitmapUser = bitmap.Ok();
     if ( m_searchBitmapUser )
     {
     m_searchBitmapUser = bitmap.Ok();
     if ( m_searchBitmapUser )
     {

-        if ( m_searchButton && !m_menu )
+        if ( m_searchButton && !HasMenu() )

         {
             m_searchButton->SetBitmapLabel( m_searchBitmap );
         }
         {
             m_searchButton->SetBitmapLabel( m_searchBitmap );
         }


@@ -815,6 +840,8 @@ void wxSearchCtrl::SetSearchBitmap( const wxBitmap& bitmap )
     }
 }
 
     }
 }
 

+#if wxUSE_MENUS
+

 void wxSearchCtrl::SetSearchMenuBitmap( const wxBitmap& bitmap )
 {
     m_searchMenuBitmap = bitmap;
 void wxSearchCtrl::SetSearchMenuBitmap( const wxBitmap& bitmap )
 {
     m_searchMenuBitmap = bitmap;


@@ -833,6 +860,8 @@ void wxSearchCtrl::SetSearchMenuBitmap( const wxBitmap& bitmap )
     }
 }
 
     }
 }
 

+#endif // wxUSE_MENUS
+

 void wxSearchCtrl::SetCancelBitmap( const wxBitmap& bitmap )
 {
     m_cancelBitmap = bitmap;
 void wxSearchCtrl::SetCancelBitmap( const wxBitmap& bitmap )
 {
     m_cancelBitmap = bitmap;


@@ -989,7 +1018,7 @@ wxBitmap wxSearchCtrl::RenderSearchBitmap( int x, int y, bool renderDrop )
         mem.DrawPolygon(WXSIZEOF(dropPolygon),dropPolygon,multiplier*triangleX,multiplier*triangleY);
     }
     mem.SelectObject(wxNullBitmap);
         mem.DrawPolygon(WXSIZEOF(dropPolygon),dropPolygon,multiplier*triangleX,multiplier*triangleY);
     }
     mem.SelectObject(wxNullBitmap);

-    
+

     //===============================================================================
     // end drawing code
     //===============================================================================
     //===============================================================================
     // end drawing code
     //===============================================================================


@@ -1114,7 +1143,7 @@ void wxSearchCtrl::RecalcBitmaps()
             )
         {
             m_searchBitmap = RenderSearchBitmap(bitmapWidth,bitmapHeight,false);
             )
         {
             m_searchBitmap = RenderSearchBitmap(bitmapWidth,bitmapHeight,false);

-            if ( !m_menu )
+            if ( !HasMenu() )

             {
                 m_searchButton->SetBitmapLabel(m_searchBitmap);
             }
             {
                 m_searchButton->SetBitmapLabel(m_searchBitmap);
             }


@@ -1122,6 +1151,7 @@ void wxSearchCtrl::RecalcBitmaps()
         // else this bitmap was set by user, don't alter
     }
 
         // else this bitmap was set by user, don't alter
     }
 

+#if wxUSE_MENUS

     if ( !m_searchMenuBitmapUser )
     {
         if (
     if ( !m_searchMenuBitmapUser )
     {
         if (


@@ -1138,6 +1168,7 @@ void wxSearchCtrl::RecalcBitmaps()
         }
         // else this bitmap was set by user, don't alter
     }
         }
         // else this bitmap was set by user, don't alter
     }

+#endif // wxUSE_MENUS

 
     if ( !m_cancelBitmapUser )
     {
 
     if ( !m_cancelBitmapUser )
     {


@@ -1147,7 +1178,7 @@ void wxSearchCtrl::RecalcBitmaps()
             m_cancelBitmap.GetWidth() != bitmapHeight
             )
         {
             m_cancelBitmap.GetWidth() != bitmapHeight
             )
         {

-            m_cancelBitmap = RenderCancelBitmap(bitmapHeight-BORDER,bitmapHeight-BORDER); // square
+            m_cancelBitmap = RenderCancelBitmap(bitmapHeight-BORDER-1,bitmapHeight-BORDER-1); // square

             m_cancelButton->SetBitmapLabel(m_cancelBitmap);
         }
         // else this bitmap was set by user, don't alter
             m_cancelButton->SetBitmapLabel(m_cancelBitmap);
         }
         // else this bitmap was set by user, don't alter


@@ -1174,6 +1205,8 @@ void wxSearchCtrl::OnSize( wxSizeEvent& WXUNUSED(event) )
     LayoutControls(0, 0, width, height);
 }
 
     LayoutControls(0, 0, width, height);
 }
 

+#if wxUSE_MENUS
+

 void wxSearchCtrl::PopupSearchMenu()
 {
     if ( m_menu )
 void wxSearchCtrl::PopupSearchMenu()
 {
     if ( m_menu )


@@ -1183,6 +1216,8 @@ void wxSearchCtrl::PopupSearchMenu()
     }
 }
 
     }
 }
 

+#endif // wxUSE_MENUS
+

 #endif // !wxUSE_NATIVE_SEARCH_CONTROL
 
 #endif // wxUSE_SEARCHCTRL
 #endif // !wxUSE_NATIVE_SEARCH_CONTROL
 
 #endif // wxUSE_SEARCHCTRL