generate size event when the dialog is shown for consistency with frames and other...

[wxWidgets.git] / src / stc / PlatWX.cpp

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 8de6eae4362455e76d89eeecb7562123624f2bf1..821e7392d41fecf0b594f169608813dc0e60a968 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -140,7 +140,7 @@ Font::~Font() {
 
 void Font::Create(const char *faceName, int characterSet,
                   int size, bool bold, bool italic,
 
 void Font::Create(const char *faceName, int characterSet,
                   int size, bool bold, bool italic,

-                  bool WXUNUSED(extraFontFlag)) {
+                  bool extraFontFlag) {

     Release();
 
     // The minus one is done because since Scintilla uses SC_SHARSET_DEFAULT
     Release();
 
     // The minus one is done because since Scintilla uses SC_SHARSET_DEFAULT


@@ -160,7 +160,7 @@ void Font::Create(const char *faceName, int characterSet,
                     false,
                     stc2wx(faceName),
                     encoding);
                     false,
                     stc2wx(faceName),
                     encoding);

-    //font->SetNoAntiAliasing(!extraFontFlag);
+    font->SetNoAntiAliasing(!extraFontFlag);

     id = font;
 }
 
     id = font;
 }
 


@@ -291,11 +291,11 @@ bool SurfaceImpl::Initialised() {
 
 
 void SurfaceImpl::PenColour(ColourAllocated fore) {
 
 
 void SurfaceImpl::PenColour(ColourAllocated fore) {

-    hdc->SetPen(wxPen(wxColourFromCA(fore), 1, wxSOLID));
+    hdc->SetPen(wxPen(wxColourFromCA(fore)));

 }
 
 void SurfaceImpl::BrushColour(ColourAllocated back) {
 }
 
 void SurfaceImpl::BrushColour(ColourAllocated back) {

-    hdc->SetBrush(wxBrush(wxColourFromCA(back), wxSOLID));
+    hdc->SetBrush(wxBrush(wxColourFromCA(back)));

 }
 
 void SurfaceImpl::SetFont(Font &font_) {
 }
 
 void SurfaceImpl::SetFont(Font &font_) {


@@ -346,7 +346,7 @@ void SurfaceImpl::FillRectangle(PRectangle rc, Surface &surfacePattern) {
     if (((SurfaceImpl&)surfacePattern).bitmap)
         br = wxBrush(*((SurfaceImpl&)surfacePattern).bitmap);
     else    // Something is wrong so display in red
     if (((SurfaceImpl&)surfacePattern).bitmap)
         br = wxBrush(*((SurfaceImpl&)surfacePattern).bitmap);
     else    // Something is wrong so display in red

-        br = wxBrush(*wxRED, wxSOLID);
+        br = wxBrush(*wxRED);

     hdc->SetPen(*wxTRANSPARENT_PEN);
     hdc->SetBrush(br);
     hdc->DrawRectangle(wxRectFromPRectangle(rc));
     hdc->SetPen(*wxTRANSPARENT_PEN);
     hdc->SetBrush(br);
     hdc->DrawRectangle(wxRectFromPRectangle(rc));


@@ -372,7 +372,7 @@ void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize,
 
     // TODO:  do something with cornerSize
     wxUnusedVar(cornerSize);
 
     // TODO:  do something with cornerSize
     wxUnusedVar(cornerSize);

-    
+

     int x, y;
     wxRect r = wxRectFromPRectangle(rc);
     wxBitmap bmp(r.width, r.height, 32);
     int x, y;
     wxRect r = wxRectFromPRectangle(rc);
     wxBitmap bmp(r.width, r.height, 32);


@@ -392,7 +392,7 @@ void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize,
             p.Green() = wxPy_premultiply(green, alphaFill);
             p.Blue()  = wxPy_premultiply(blue,  alphaFill);
             p.Alpha() = alphaFill;
             p.Green() = wxPy_premultiply(green, alphaFill);
             p.Blue()  = wxPy_premultiply(blue,  alphaFill);
             p.Alpha() = alphaFill;

-            ++p; 
+            ++p;

         }
     }
 
         }
     }
 


@@ -406,12 +406,12 @@ void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize,
         p.Red()   = wxPy_premultiply(red,   alphaOutline);
         p.Green() = wxPy_premultiply(green, alphaOutline);
         p.Blue()  = wxPy_premultiply(blue,  alphaOutline);
         p.Red()   = wxPy_premultiply(red,   alphaOutline);
         p.Green() = wxPy_premultiply(green, alphaOutline);
         p.Blue()  = wxPy_premultiply(blue,  alphaOutline);

-        p.Alpha() = alphaOutline;        
+        p.Alpha() = alphaOutline;

         p.MoveTo(pixData, x, r.height-1);
         p.Red()   = wxPy_premultiply(red,   alphaOutline);
         p.Green() = wxPy_premultiply(green, alphaOutline);
         p.Blue()  = wxPy_premultiply(blue,  alphaOutline);
         p.MoveTo(pixData, x, r.height-1);
         p.Red()   = wxPy_premultiply(red,   alphaOutline);
         p.Green() = wxPy_premultiply(green, alphaOutline);
         p.Blue()  = wxPy_premultiply(blue,  alphaOutline);

-        p.Alpha() = alphaOutline;        
+        p.Alpha() = alphaOutline;

     }
 
     for (y=0; y<r.height; y++) {
     }
 
     for (y=0; y<r.height; y++) {


@@ -419,14 +419,14 @@ void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize,
         p.Red()   = wxPy_premultiply(red,   alphaOutline);
         p.Green() = wxPy_premultiply(green, alphaOutline);
         p.Blue()  = wxPy_premultiply(blue,  alphaOutline);
         p.Red()   = wxPy_premultiply(red,   alphaOutline);
         p.Green() = wxPy_premultiply(green, alphaOutline);
         p.Blue()  = wxPy_premultiply(blue,  alphaOutline);

-        p.Alpha() = alphaOutline;        
+        p.Alpha() = alphaOutline;

         p.MoveTo(pixData, r.width-1, y);
         p.Red()   = wxPy_premultiply(red,   alphaOutline);
         p.Green() = wxPy_premultiply(green, alphaOutline);
         p.Blue()  = wxPy_premultiply(blue,  alphaOutline);
         p.MoveTo(pixData, r.width-1, y);
         p.Red()   = wxPy_premultiply(red,   alphaOutline);
         p.Green() = wxPy_premultiply(green, alphaOutline);
         p.Blue()  = wxPy_premultiply(blue,  alphaOutline);

-        p.Alpha() = alphaOutline;        
+        p.Alpha() = alphaOutline;

     }
     }

-    
+

     // Draw the bitmap
     hdc->DrawBitmap(bmp, r.x, r.y, true);
 
     // Draw the bitmap
     hdc->DrawBitmap(bmp, r.x, r.y, true);
 


@@ -485,13 +485,13 @@ void SurfaceImpl::DrawTextTransparent(PRectangle rc, Font &font, int ybase,
 
     SetFont(font);
     hdc->SetTextForeground(wxColourFromCA(fore));
 
     SetFont(font);
     hdc->SetTextForeground(wxColourFromCA(fore));

-    hdc->SetBackgroundMode(wxTRANSPARENT);
+    hdc->SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);

 
     // ybase is where the baseline should be, but wxWin uses the upper left
     // corner, so I need to calculate the real position for the text...
     hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent);
 
 
     // ybase is where the baseline should be, but wxWin uses the upper left
     // corner, so I need to calculate the real position for the text...
     hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent);
 

-    hdc->SetBackgroundMode(wxSOLID);
+    hdc->SetBackgroundMode(wxBRUSHSTYLE_SOLID);

 }
 
 
 }
 
 


@@ -823,7 +823,7 @@ public:
     wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point WXUNUSED(location)) :
         wxPopupWindow(parent, wxBORDER_NONE)
     {
     wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point WXUNUSED(location)) :
         wxPopupWindow(parent, wxBORDER_NONE)
     {

-        
+

         SetBackgroundColour(*wxBLACK);  // for our simple border
 
         lv = new wxSTCListBox(parent, id, wxPoint(-50,-50), wxDefaultSize,
         SetBackgroundColour(*wxBLACK);  // for our simple border
 
         lv = new wxSTCListBox(parent, id, wxPoint(-50,-50), wxDefaultSize,


@@ -946,7 +946,7 @@ public:
                 wxFRAME_NO_TASKBAR
                 | wxFRAME_FLOAT_ON_PARENT
 #ifdef __WXMAC__
                 wxFRAME_NO_TASKBAR
                 | wxFRAME_FLOAT_ON_PARENT
 #ifdef __WXMAC__

-                | wxPOPUP_WINDOW 
+                | wxPOPUP_WINDOW

                 | wxNO_BORDER
 #else
                 | wxSIMPLE_BORDER
                 | wxNO_BORDER
 #else
                 | wxSIMPLE_BORDER


@@ -965,7 +965,7 @@ public:
         lv->SetFocus();
 
         Hide();
         lv->SetFocus();
 
         Hide();

-    } 
+    }

 
 
     // On OSX and (possibly others) there can still be pending
 
 
     // On OSX and (possibly others) there can still be pending


@@ -1035,7 +1035,7 @@ public:
         if (frame)
             frame->Raise();
     }
         if (frame)
             frame->Raise();
     }

-        
+

 
     virtual void DoSetSize(int x, int y,
                            int width, int height,
 
     virtual void DoSetSize(int x, int y,
                            int width, int height,


@@ -1234,13 +1234,14 @@ void ListBoxImpl::Append(char *s, int type) {
 void ListBoxImpl::Append(const wxString& text, int type) {
     long count  = GETLB(id)->GetItemCount();
     long itemID  = GETLB(id)->InsertItem(count, wxEmptyString);
 void ListBoxImpl::Append(const wxString& text, int type) {
     long count  = GETLB(id)->GetItemCount();
     long itemID  = GETLB(id)->InsertItem(count, wxEmptyString);

+    long idx = -1;

     GETLB(id)->SetItem(itemID, 1, text);
     maxStrWidth = wxMax(maxStrWidth, text.length());
     if (type != -1) {
         wxCHECK_RET(imgTypeMap, wxT("Unexpected NULL imgTypeMap"));
     GETLB(id)->SetItem(itemID, 1, text);
     maxStrWidth = wxMax(maxStrWidth, text.length());
     if (type != -1) {
         wxCHECK_RET(imgTypeMap, wxT("Unexpected NULL imgTypeMap"));

-        long idx = imgTypeMap->Item(type);
-        GETLB(id)->SetItemImage(itemID, idx, idx);
+        idx = imgTypeMap->Item(type);

     }
     }

+    GETLB(id)->SetItemImage(itemID, idx, idx);

 }
 
 void ListBoxImpl::SetList(const char* list, char separator, char typesep) {
 }
 
 void ListBoxImpl::SetList(const char* list, char separator, char typesep) {