Changeset 248:34409a2fc053

Show
Ignore:
Timestamp:
05/22/08 13:00:47 (4 months ago)
Author:
Frank Benoit <benoit@tionex.de>
branch:
default
Message:

Fix call OS.gtk_label_set_text_with_mnemonic with valid ptr, even for zero length strings.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • dwt/widgets/Button.d

    r240 r248  
    194194override void createHandle (int index) { 
    195195    state |= HANDLE; 
    196     if ((style & (DWT.PUSH | DWT.TOGGLE)) is 0) state |= THEME_BACKGROUND;   
     196    if ((style & (DWT.PUSH | DWT.TOGGLE)) is 0) state |= THEME_BACKGROUND; 
    197197    int bits = DWT.ARROW | DWT.TOGGLE | DWT.CHECK | DWT.RADIO | DWT.PUSH; 
    198198    fixedHandle = cast(GtkWidget*)OS.g_object_new (display.gtk_fixed_get_type (), null); 
    …… 
    797797    text = string; 
    798798    char [] chars = fixMnemonic (string); 
    799     OS.gtk_label_set_text_with_mnemonic (cast(GtkLabel*)labelHandle, toStringz(chars)); 
     799    OS.gtk_label_set_text_with_mnemonic (cast(GtkLabel*)labelHandle, chars.toStringzValidPtr() ); 
    800800    if (image is null) OS.gtk_widget_hide (imageHandle); 
    801801    OS.gtk_widget_show (labelHandle); 

  • dwt/widgets/Group.d

    r238 r248  
    286286    text = string; 
    287287    char [] chars = fixMnemonic (string); 
    288     OS.gtk_label_set_text_with_mnemonic (cast(GtkLabel*)labelHandle, toStringz(chars)); 
     288    OS.gtk_label_set_text_with_mnemonic (cast(GtkLabel*)labelHandle, chars.toStringzValidPtr()); 
    289289    if (string.length !is 0) { 
    290290        if (OS.gtk_frame_get_label_widget (cast(GtkFrame*)handle) is null) { 

  • dwt/widgets/MenuItem.d

    r240 r248  
    853853    } 
    854854    char [] chars = fixMnemonic (string); 
    855     char* buffer = toStringz( chars ); 
    856855    auto label = OS.gtk_bin_get_child (cast(GtkBin*)handle); 
    857     OS.gtk_label_set_text_with_mnemonic (cast(GtkLabel*)label, buffer); 
     856    OS.gtk_label_set_text_with_mnemonic (cast(GtkLabel*)label, chars.toStringzValidPtr() ); 
    858857 
    859858    auto ptr = cast(char*)OS.g_malloc (accelString.length + 1); 

  • dwt/widgets/TabItem.d

    r240 r248  
    346346    super.setText (string); 
    347347    char [] chars = fixMnemonic (string); 
    348     char* buffer = tango.stdc.stringz.toStringz( chars); 
    349     OS.gtk_label_set_text_with_mnemonic (labelHandle, buffer); 
     348    OS.gtk_label_set_text_with_mnemonic (labelHandle, chars.toStringzValidPtr() ); 
    350349    if (string.length !is 0) { 
    351350        OS.gtk_widget_show (labelHandle); 

  • dwt/widgets/TableColumn.d

    r238 r248  
    614614    super.setText (string); 
    615615    char [] chars = fixMnemonic (string); 
    616     char* buffer = tango.stdc.stringz.toStringz( chars ); 
    617     OS.gtk_label_set_text_with_mnemonic (labelHandle, buffer); 
     616    OS.gtk_label_set_text_with_mnemonic (labelHandle, chars.toStringzValidPtr() ); 
    618617    if (string.length !is 0) { 
    619618        OS.gtk_widget_show (labelHandle); 

  • dwt/widgets/ToolItem.d

    r240 r248  
    992992    if (labelHandle is null) return; 
    993993    char [] chars = fixMnemonic (string); 
    994     OS.gtk_label_set_text_with_mnemonic (labelHandle, toStringz(chars)); 
     994    OS.gtk_label_set_text_with_mnemonic (labelHandle, chars.toStringzValidPtr()); 
    995995    if (string.length !is 0) { 
    996996        OS.gtk_widget_show (labelHandle); 

  • dwt/widgets/TreeColumn.d

    r240 r248  
    609609    super.setText (string); 
    610610    char [] chars = fixMnemonic (string); 
    611     char* buffer = tango.stdc.stringz.toStringz(chars); 
    612     OS.gtk_label_set_text_with_mnemonic (labelHandle, buffer); 
     611    OS.gtk_label_set_text_with_mnemonic (labelHandle, chars.toStringzValidPtr()); 
    613612    if (string.length !is 0) { 
    614613        OS.gtk_widget_show (labelHandle);